Bug 1308587 - Use script to remove -moz- prefixes from all usages of CSS multi-column properties in the tree r?dbaron draft
authorNeerja Pancholi <npancholi@mozilla.com>
Mon, 10 Oct 2016 17:51:26 -0700
changeset 423822 64b924fd1f95132ee9e6b2a5c2099083adab0478
parent 423811 b0181d1ae9d96646d142b78e6606bc2fd0775042
child 533533 284d2a70e8ae4dcdcbae56c491e8d4a8b8361452
push id31999
push userbmo:npancholi@mozilla.com
push dateTue, 11 Oct 2016 18:34:33 +0000
reviewersdbaron
bugs1308587
milestone52.0a1
Bug 1308587 - Use script to remove -moz- prefixes from all usages of CSS multi-column properties in the tree r?dbaron Command used: find ./* -type f | xargs egrep -ls '.*-moz-column.*' | xargs sed -i '' 's/-moz-column/column/g' Exceptions to this substitution: 1. nsCSSAnonBoxList.h 2. nsCSSPropAliasList.h 3. property_database.js 4. properties-db.js MozReview-Commit-ID: 8lTIQ0FvG7h
devtools/client/debugger/new/bundle.js
devtools/client/themes/styleeditor.css
dom/grid/test/chrome/test_grid_fragmentation.html
dom/tests/mochitest/general/test_clientRects.html
gfx/tests/crashtests/768079-1.html
layout/base/crashtests/337419-1.html
layout/base/crashtests/386266-1.html
layout/base/crashtests/397011-1.xhtml
layout/base/crashtests/399687-1.html
layout/base/crashtests/401734-1.html
layout/base/crashtests/401734-2.html
layout/base/crashtests/403569-1.xhtml
layout/base/crashtests/403569-2.xhtml
layout/base/crashtests/403569-3.xhtml
layout/base/crashtests/404721-1.xhtml
layout/base/crashtests/404721-2.xhtml
layout/base/crashtests/408292.html
layout/base/crashtests/408299.html
layout/base/crashtests/408450-1.xhtml
layout/base/crashtests/411870-1.html
layout/base/crashtests/420031-1.html
layout/base/crashtests/420213-1.html
layout/base/crashtests/420651-1.xhtml
layout/base/crashtests/423107-1.xhtml
layout/base/crashtests/425981-1.html
layout/base/crashtests/428448-1.html
layout/base/crashtests/429881.html
layout/base/crashtests/430569-1.html
layout/base/crashtests/430569-2.html
layout/base/crashtests/433450-1.html
layout/base/crashtests/455063-3.html
layout/base/crashtests/460389-1.html
layout/base/crashtests/468563-1.html
layout/base/crashtests/468578-1.xhtml
layout/base/crashtests/474075.html
layout/base/crashtests/477731-1.html
layout/base/crashtests/480686-1.html
layout/base/crashtests/499741-1.xhtml
layout/base/crashtests/499858-1.xhtml
layout/base/crashtests/534368-1.xhtml
layout/base/crashtests/535911-1.xhtml
layout/base/crashtests/537562-1.xhtml
layout/base/crashtests/537631-1.html
layout/base/crashtests/538267-1.html
layout/base/crashtests/576649-1.html
layout/base/crashtests/580129-1.html
layout/base/crashtests/589787.html
layout/base/crashtests/645193.html
layout/base/crashtests/650489.xhtml
layout/base/crashtests/663662-1.html
layout/base/crashtests/663662-2.html
layout/base/crashtests/665837.html
layout/base/crashtests/691118-1.html
layout/base/crashtests/695861.html
layout/base/crashtests/698335.html
layout/base/crashtests/701504.html
layout/base/crashtests/709536-1.xhtml
layout/base/crashtests/736389-1.xhtml
layout/base/crashtests/772306.html
layout/base/crashtests/788360.html
layout/base/tests/test_getBoxQuads_convertPointRectQuad.html
layout/forms/crashtests/407066.html
layout/forms/crashtests/451316.html
layout/forms/crashtests/513113-1.html
layout/forms/crashtests/865602.html
layout/generic/crashtests/1015844.html
layout/generic/crashtests/1037903.html
layout/generic/crashtests/1042489.html
layout/generic/crashtests/1153695.html
layout/generic/crashtests/1225005.html
layout/generic/crashtests/1229437-1.html
layout/generic/crashtests/1229437-2.html
layout/generic/crashtests/1278461-1.html
layout/generic/crashtests/1278461-2.html
layout/generic/crashtests/337412-1.html
layout/generic/crashtests/344557-1.html
layout/generic/crashtests/348887-1-inner.html
layout/generic/crashtests/350370.html
layout/generic/crashtests/354458-1.html
layout/generic/crashtests/354458-2.html
layout/generic/crashtests/355426-1.html
layout/generic/crashtests/359371-1.html
layout/generic/crashtests/359371-2.html
layout/generic/crashtests/364220.html
layout/generic/crashtests/367360.html
layout/generic/crashtests/368568.html
layout/generic/crashtests/368863-1.html
layout/generic/crashtests/376419.html
layout/generic/crashtests/382262-1.html
layout/generic/crashtests/386827-1.html
layout/generic/crashtests/390050-1.html
layout/generic/crashtests/390050-2.html
layout/generic/crashtests/390050-3.html
layout/generic/crashtests/390762-1.html
layout/generic/crashtests/391894-1.html
layout/generic/crashtests/393956-1.html
layout/generic/crashtests/393956-2.html
layout/generic/crashtests/393956-3.html
layout/generic/crashtests/393956-4.html
layout/generic/crashtests/394237-1.html
layout/generic/crashtests/395316-1.html
layout/generic/crashtests/397007-1.html
layout/generic/crashtests/398322-2.html
layout/generic/crashtests/398332-2.html
layout/generic/crashtests/399407-1.xhtml
layout/generic/crashtests/399412-1.html
layout/generic/crashtests/399843-1.html
layout/generic/crashtests/400078-1.html
layout/generic/crashtests/400190.html
layout/generic/crashtests/400223-1.html
layout/generic/crashtests/400232-1.html
layout/generic/crashtests/400244-1.html
layout/generic/crashtests/404140-1.html
layout/generic/crashtests/404146-1.html
layout/generic/crashtests/404215-1.html
layout/generic/crashtests/404215-2.html
layout/generic/crashtests/404215-3.html
layout/generic/crashtests/404219-1.html
layout/generic/crashtests/404219-2.html
layout/generic/crashtests/406380.html
layout/generic/crashtests/406902-1.html
layout/generic/crashtests/408602-1.html
layout/generic/crashtests/408737-1.html
layout/generic/crashtests/408737-2.html
layout/generic/crashtests/408749-1.xhtml
layout/generic/crashtests/408883-1.html
layout/generic/crashtests/411213-1.html
layout/generic/crashtests/411213-2.xml
layout/generic/crashtests/411835.html
layout/generic/crashtests/412014-1.html
layout/generic/crashtests/412543-1.html
layout/generic/crashtests/413048-1.html
layout/generic/crashtests/413079-1.xhtml
layout/generic/crashtests/413079-2.xhtml
layout/generic/crashtests/413079-3.xhtml
layout/generic/crashtests/413582-1.xhtml
layout/generic/crashtests/413582-2.html
layout/generic/crashtests/414061-1.html
layout/generic/crashtests/414719-1.html
layout/generic/crashtests/415685-1.html
layout/generic/crashtests/416165.html
layout/generic/crashtests/416264-1.html
layout/generic/crashtests/416476-1.html
layout/generic/crashtests/417848-1.xhtml
layout/generic/crashtests/417902-1.html
layout/generic/crashtests/417902-2.html
layout/generic/crashtests/418532-1.html
layout/generic/crashtests/418932-1.html
layout/generic/crashtests/420000-1.html
layout/generic/crashtests/421671.html
layout/generic/crashtests/422283-1.html
layout/generic/crashtests/422301-1.html
layout/generic/crashtests/423055-1.html
layout/generic/crashtests/423098.html
layout/generic/crashtests/423264-1.html
layout/generic/crashtests/426040-1.html
layout/generic/crashtests/426272-1.html
layout/generic/crashtests/428263-1.html
layout/generic/crashtests/429981-1.html
layout/generic/crashtests/430744-1.html
layout/generic/crashtests/430991.html
layout/generic/crashtests/435529.html
layout/generic/crashtests/436194-1.html
layout/generic/crashtests/436602-1.html
layout/generic/crashtests/436823.html
layout/generic/crashtests/436969-1.html
layout/generic/crashtests/437156-1.html
layout/generic/crashtests/438266-1.html
layout/generic/crashtests/442860-1.xul
layout/generic/crashtests/443528-1.html
layout/generic/crashtests/448996-1.html
layout/generic/crashtests/451315-1.html
layout/generic/crashtests/452157-1.html
layout/generic/crashtests/452157-2.html
layout/generic/crashtests/452157-3.html
layout/generic/crashtests/455643-1.xhtml
layout/generic/crashtests/457375.html
layout/generic/crashtests/462968.xhtml
layout/generic/crashtests/463350-1.html
layout/generic/crashtests/463350-2.html
layout/generic/crashtests/463350-3.html
layout/generic/crashtests/463741-1.html
layout/generic/crashtests/463785.xhtml
layout/generic/crashtests/465651-1.html
layout/generic/crashtests/467493-1.html
layout/generic/crashtests/467493-2.html
layout/generic/crashtests/468207-1.html
layout/generic/crashtests/468771-1.xhtml
layout/generic/crashtests/468771-2.xhtml
layout/generic/crashtests/469859-1.xhtml
layout/generic/crashtests/472587-1.xhtml
layout/generic/crashtests/472617-1.xhtml
layout/generic/crashtests/472774-1.html
layout/generic/crashtests/476241-1.html
layout/generic/crashtests/477731-1.html
layout/generic/crashtests/477928.html
layout/generic/crashtests/478131-1.html
layout/generic/crashtests/478170-1.html
layout/generic/crashtests/478185-1.html
layout/generic/crashtests/479938-1.html
layout/generic/crashtests/489477.html
layout/generic/crashtests/489480-1.xhtml
layout/generic/crashtests/493118-1.html
layout/generic/crashtests/493649.html
layout/generic/crashtests/495875-1.html
layout/generic/crashtests/495875-2.html
layout/generic/crashtests/499138-iframe.html
layout/generic/crashtests/499857-1.html
layout/generic/crashtests/499885-1.xhtml
layout/generic/crashtests/503961-1.xhtml
layout/generic/crashtests/503961-2.html
layout/generic/crashtests/508168-1.html
layout/generic/crashtests/509749-1.html
layout/generic/crashtests/511482.html
layout/generic/crashtests/512724-1.html
layout/generic/crashtests/513394-1.html
layout/generic/crashtests/514800-1.html
layout/generic/crashtests/515811-1.html
layout/generic/crashtests/519031.xhtml
layout/generic/crashtests/520340.html
layout/generic/crashtests/522170-1.html
layout/generic/crashtests/526217.html
layout/generic/crashtests/533379-1.html
layout/generic/crashtests/533379-2.html
layout/generic/crashtests/534082-1.html
layout/generic/crashtests/537645.xhtml
layout/generic/crashtests/542136-1.html
layout/generic/crashtests/545571-1.html
layout/generic/crashtests/553504-1.xhtml
layout/generic/crashtests/564968.xhtml
layout/generic/crashtests/569193-1.html
layout/generic/crashtests/571975-1.html
layout/generic/crashtests/571995.xhtml
layout/generic/crashtests/580504-1.xhtml
layout/generic/crashtests/586806-1.html
layout/generic/crashtests/586806-2.html
layout/generic/crashtests/586806-3.html
layout/generic/crashtests/586973-1.html
layout/generic/crashtests/589002-1.html
layout/generic/crashtests/600100.xhtml
layout/generic/crashtests/606642.xhtml
layout/generic/crashtests/616052-1.html
layout/generic/crashtests/621424-1.html
layout/generic/crashtests/641724.html
layout/generic/crashtests/655462-1.html
layout/generic/crashtests/660416.html
layout/generic/crashtests/673770.html
layout/generic/crashtests/682649-1.html
layout/generic/crashtests/683702-1.xhtml
layout/generic/crashtests/691210.html
layout/generic/crashtests/718516.html
layout/generic/crashtests/723108.html
layout/generic/crashtests/724978.xhtml
layout/generic/crashtests/730559.html
layout/generic/crashtests/734777.html
layout/generic/crashtests/747688.html
layout/generic/crashtests/750066-iframe.html
layout/generic/crashtests/757413-2.html
layout/generic/crashtests/762902.html
layout/generic/crashtests/769120.html
layout/generic/crashtests/777838.html
layout/generic/crashtests/783228.html
layout/generic/crashtests/791601.xhtml
layout/generic/crashtests/810726-2.html
layout/generic/crashtests/812893.html
layout/generic/crashtests/836895.html
layout/generic/crashtests/837007.xhtml
layout/generic/crashtests/840787.html
layout/generic/crashtests/840818.html
layout/generic/crashtests/847130.xhtml
layout/generic/crashtests/849603.html
layout/generic/crashtests/850931.html
layout/generic/crashtests/862185.html
layout/generic/crashtests/863935.html
layout/generic/crashtests/914501.html
layout/generic/crashtests/details-three-columns.html
layout/generic/crashtests/first-letter-638937-1.html
layout/generic/crashtests/first-letter-638937-2.html
layout/generic/crashtests/font-inflation-762332.html
layout/generic/crashtests/text-overflow-bug670564.xhtml
layout/generic/test/test_bug392923.html
layout/generic/test/test_bug405178.html
layout/reftests/abs-pos/multi-column-1.html
layout/reftests/bidi/unicode-bidi-isolate-basic-ref.html
layout/reftests/bidi/unicode-bidi-isolate-basic.html
layout/reftests/box-shadow/611574-1-ref.html
layout/reftests/box-shadow/611574-1.html
layout/reftests/box-shadow/611574-2-ref.html
layout/reftests/box-shadow/611574-2.html
layout/reftests/bugs/243519-2-ref.html
layout/reftests/bugs/243519-2.html
layout/reftests/bugs/323656-3-ref.html
layout/reftests/bugs/323656-3.html
layout/reftests/bugs/368020-1-ref.html
layout/reftests/bugs/368020-1.html
layout/reftests/bugs/371043-1-ref.html
layout/reftests/bugs/371043-1.html
layout/reftests/bugs/379349-1-ref.xhtml
layout/reftests/bugs/379349-1a.xhtml
layout/reftests/bugs/379349-1b.xhtml
layout/reftests/bugs/379349-1c.xhtml
layout/reftests/bugs/379349-2-ref.xhtml
layout/reftests/bugs/379349-2a.xhtml
layout/reftests/bugs/379349-2b.xhtml
layout/reftests/bugs/386147-1-ref.html
layout/reftests/bugs/386147-1.html
layout/reftests/bugs/387876-1-ref.html
layout/reftests/bugs/387876-1.html
layout/reftests/bugs/387876-2-ref.html
layout/reftests/bugs/387876-2.html
layout/reftests/bugs/387876-3-ref.html
layout/reftests/bugs/387876-3a.html
layout/reftests/bugs/387876-3b.html
layout/reftests/bugs/391979.html
layout/reftests/bugs/393330-1-ref.html
layout/reftests/bugs/393330-1.html
layout/reftests/bugs/393649-1-ref.html
layout/reftests/bugs/393649-1.html
layout/reftests/bugs/403134-1-ref.html
layout/reftests/bugs/403134-1.html
layout/reftests/bugs/408493-1.html
layout/reftests/bugs/408493-2-ref.html
layout/reftests/bugs/408493-2.html
layout/reftests/bugs/563584-6-columns.html
layout/reftests/bugs/563584-9a.html
layout/reftests/bugs/563584-9b.html
layout/reftests/bugs/563584-9c.html
layout/reftests/bugs/563584-9d.html
layout/reftests/bugs/571281-1b.html
layout/reftests/bugs/571281-1c.html
layout/reftests/bugs/641856-1-ref.html
layout/reftests/bugs/641856-1.html
layout/reftests/bugs/696307-1.html
layout/reftests/bugs/722888-1-ref.html
layout/reftests/bugs/722888-1.html
layout/reftests/bugs/728983-1-ref.html
layout/reftests/bugs/728983-1.html
layout/reftests/bugs/751012-1b.html
layout/reftests/bugs/921716-1-ref.html
layout/reftests/bugs/921716-1.html
layout/reftests/columns/basic-1.html
layout/reftests/columns/column-balancing-000.html
layout/reftests/columns/column-balancing-001.html
layout/reftests/columns/column-balancing-002.html
layout/reftests/columns/column-balancing-003.html
layout/reftests/columns/column-balancing-004.html
layout/reftests/columns/column-balancing-nested-000-ref.html
layout/reftests/columns/column-balancing-nested-000.html
layout/reftests/columns/column-balancing-nested-001-ref.html
layout/reftests/columns/column-balancing-nested-001.html
layout/reftests/columns/column-balancing-overflow-000.html
layout/reftests/columns/column-balancing-overflow-000.ref.html
layout/reftests/columns/column-balancing-overflow-001.html
layout/reftests/columns/column-balancing-overflow-002.html
layout/reftests/columns/column-balancing-overflow-003.html
layout/reftests/columns/column-balancing-overflow-003.ref.html
layout/reftests/columns/column-balancing-overflow-004.html
layout/reftests/columns/column-balancing-overflow-005.html
layout/reftests/columns/column-box-alignment-rtl.html
layout/reftests/columns/columnfill-auto-2-ref.html
layout/reftests/columns/columnfill-auto-2.html
layout/reftests/columns/columnfill-auto-3.html
layout/reftests/columns/columnfill-auto.html
layout/reftests/columns/columnfill-balance.html
layout/reftests/columns/columnfill-overflow-ref.html
layout/reftests/columns/columnfill-overflow.html
layout/reftests/columns/columnrule-basic-ref.html
layout/reftests/columns/columnrule-basic.html
layout/reftests/columns/columnrule-complex-ref.html
layout/reftests/columns/columnrule-complex.html
layout/reftests/columns/columnrule-linestyles-notref.html
layout/reftests/columns/columnrule-linestyles.html
layout/reftests/columns/columnrule-overflow.html
layout/reftests/columns/columnrule-padding-ref.html
layout/reftests/columns/columnrule-padding.html
layout/reftests/columns/columns-table-caption-000-ref.html
layout/reftests/columns/columns-table-caption-000.html
layout/reftests/columns/fieldset-columns-001-ref.html
layout/reftests/columns/fieldset-columns-001.html
layout/reftests/columns/margin-collapsing-bug616722-1-ref.html
layout/reftests/columns/margin-collapsing-bug616722-1.html
layout/reftests/columns/margin-collapsing-bug616722-2-ref.html
layout/reftests/columns/margin-collapsing-bug616722-2.html
layout/reftests/columns/min-width-1a.html
layout/reftests/columns/min-width-1b.html
layout/reftests/columns/min-width-1c.html
layout/reftests/columns/min-width-2.html
layout/reftests/columns/positioning-transforms-bug1112501-ref.html
layout/reftests/columns/positioning-transforms-bug1112501.html
layout/reftests/columns/pref-width-1a.html
layout/reftests/columns/pref-width-1b.html
layout/reftests/columns/pref-width-1c.html
layout/reftests/css-break/box-decoration-break-block-border-padding-ref.html
layout/reftests/css-break/box-decoration-break-block-border-padding.html
layout/reftests/css-break/box-decoration-break-block-margin-ref.html
layout/reftests/css-break/box-decoration-break-block-margin.html
layout/reftests/css-break/box-decoration-break-border-image-ref.html
layout/reftests/css-break/box-decoration-break-border-image.html
layout/reftests/css-break/box-decoration-break-bug-1249913-ref.html
layout/reftests/css-break/box-decoration-break-bug-1249913.html
layout/reftests/css-display/display-contents-acid-ref.html
layout/reftests/css-display/display-contents-acid.html
layout/reftests/css-grid/grid-fragmentation-001-ref.html
layout/reftests/css-grid/grid-fragmentation-001.html
layout/reftests/css-grid/grid-fragmentation-002-ref.html
layout/reftests/css-grid/grid-fragmentation-002.html
layout/reftests/css-grid/grid-fragmentation-003-ref.html
layout/reftests/css-grid/grid-fragmentation-003.html
layout/reftests/css-grid/grid-fragmentation-004-ref.html
layout/reftests/css-grid/grid-fragmentation-004.html
layout/reftests/css-grid/grid-fragmentation-005-ref.html
layout/reftests/css-grid/grid-fragmentation-005.html
layout/reftests/css-grid/grid-fragmentation-006-ref.html
layout/reftests/css-grid/grid-fragmentation-006.html
layout/reftests/css-grid/grid-fragmentation-007-ref.html
layout/reftests/css-grid/grid-fragmentation-007.html
layout/reftests/css-grid/grid-fragmentation-008-ref.html
layout/reftests/css-grid/grid-fragmentation-008.html
layout/reftests/css-grid/grid-fragmentation-009-ref.html
layout/reftests/css-grid/grid-fragmentation-009.html
layout/reftests/css-grid/grid-fragmentation-015-ref.html
layout/reftests/css-grid/grid-fragmentation-015.html
layout/reftests/css-grid/grid-fragmentation-016-ref.html
layout/reftests/css-grid/grid-fragmentation-016.html
layout/reftests/css-grid/grid-fragmentation-017-ref.html
layout/reftests/css-grid/grid-fragmentation-017.html
layout/reftests/css-grid/grid-fragmentation-018-ref.html
layout/reftests/css-grid/grid-fragmentation-018.html
layout/reftests/css-grid/grid-fragmentation-019-ref.html
layout/reftests/css-grid/grid-fragmentation-019.html
layout/reftests/css-grid/grid-fragmentation-020-ref.html
layout/reftests/css-grid/grid-fragmentation-020.html
layout/reftests/css-grid/grid-fragmentation-021-ref.html
layout/reftests/css-grid/grid-fragmentation-021.html
layout/reftests/css-grid/grid-fragmentation-022.html
layout/reftests/css-grid/grid-fragmentation-023-ref.html
layout/reftests/css-grid/grid-fragmentation-023.html
layout/reftests/css-grid/grid-fragmentation-024-ref.html
layout/reftests/css-grid/grid-fragmentation-024.html
layout/reftests/css-grid/grid-fragmentation-025-ref.html
layout/reftests/css-grid/grid-fragmentation-025.html
layout/reftests/css-grid/grid-fragmentation-026-ref.html
layout/reftests/css-grid/grid-fragmentation-026.html
layout/reftests/css-grid/grid-fragmentation-027.html
layout/reftests/css-grid/grid-fragmentation-028-ref.html
layout/reftests/css-grid/grid-fragmentation-028.html
layout/reftests/css-grid/grid-fragmentation-029-ref.html
layout/reftests/css-grid/grid-fragmentation-029.html
layout/reftests/css-grid/grid-fragmentation-030-ref.html
layout/reftests/css-grid/grid-fragmentation-030.html
layout/reftests/css-grid/grid-fragmentation-031-ref.html
layout/reftests/css-grid/grid-fragmentation-031.html
layout/reftests/css-grid/grid-item-mixed-baseline-004-ref.html
layout/reftests/css-grid/grid-item-mixed-baseline-004.html
layout/reftests/css-visited/column-rule-1-notref.html
layout/reftests/css-visited/column-rule-1-ref.html
layout/reftests/css-visited/column-rule-1.html
layout/reftests/details-summary/details-three-columns-ref.html
layout/reftests/details-summary/details-three-columns.html
layout/reftests/details-summary/summary-three-columns-ref.html
layout/reftests/details-summary/summary-three-columns.html
layout/reftests/first-line/stress-10.html
layout/reftests/first-line/stress-6.html
layout/reftests/first-line/stress-7.html
layout/reftests/first-line/stress-9-ref.html
layout/reftests/first-line/stress-9.html
layout/reftests/flexbox/pagination/flexbox-empty-1-ref.html
layout/reftests/flexbox/pagination/flexbox-empty-1a.html
layout/reftests/flexbox/pagination/flexbox-empty-1b.html
layout/reftests/flexbox/pagination/flexbox-empty-1c.html
layout/reftests/flexbox/pagination/flexbox-empty-1d.html
layout/reftests/flexbox/pagination/flexbox-empty-1e.html
layout/reftests/flexbox/pagination/flexbox-empty-1f.html
layout/reftests/flexbox/pagination/flexbox-empty-1g.html
layout/reftests/flexbox/pagination/flexbox-empty-1h.html
layout/reftests/flexbox/pagination/flexbox-empty-2-ref.html
layout/reftests/flexbox/pagination/flexbox-empty-2a.html
layout/reftests/flexbox/pagination/flexbox-empty-2b.html
layout/reftests/flexbox/pagination/flexbox-empty-2c.html
layout/reftests/flexbox/pagination/flexbox-empty-2d.html
layout/reftests/flexbox/pagination/flexbox-multicol-vert-empty-2.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1-ref.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2-ref.html
layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2.html
layout/reftests/forms/button/display-grid-flex-columnset-ref.html
layout/reftests/forms/button/display-grid-flex-columnset.html
layout/reftests/list-item/numbering-1-ref.html
layout/reftests/list-item/numbering-1.html
layout/reftests/list-item/numbering-3-ref.html
layout/reftests/list-item/numbering-3.html
layout/reftests/list-item/numbering-4-ref.html
layout/reftests/list-item/numbering-4.html
layout/reftests/margin-collapsing/column-child-1.html
layout/reftests/margin-collapsing/column-sibling-1a-dyn.html
layout/reftests/margin-collapsing/column-sibling-1a.html
layout/reftests/margin-collapsing/column-sibling-1b-dyn.html
layout/reftests/margin-collapsing/column-sibling-1b.html
layout/reftests/margin-collapsing/column-sibling-1c-dyn.html
layout/reftests/margin-collapsing/column-sibling-1c.html
layout/reftests/margin-collapsing/column-sibling-2a-dyn.html
layout/reftests/margin-collapsing/column-sibling-2a.html
layout/reftests/margin-collapsing/column-sibling-2b-dyn.html
layout/reftests/margin-collapsing/column-sibling-2b.html
layout/reftests/margin-collapsing/column-sibling-2c-dyn.html
layout/reftests/margin-collapsing/column-sibling-2c.html
layout/reftests/pagination/abspos-overflow-01-cols.xhtml
layout/reftests/pagination/border-breaking-000-cols.xhtml
layout/reftests/pagination/border-breaking-001-cols.ref.xhtml
layout/reftests/pagination/border-breaking-001-cols.xhtml
layout/reftests/pagination/border-breaking-002-cols.ref.xhtml
layout/reftests/pagination/border-breaking-002-cols.xhtml
layout/reftests/pagination/border-breaking-003-cols.xhtml
layout/reftests/pagination/border-breaking-004-cols.xhtml
layout/reftests/pagination/column-balancing-break-inside-avoid-2-ref.html
layout/reftests/pagination/column-balancing-break-inside-avoid-2.html
layout/reftests/pagination/content-inserted-000.ref.xhtml
layout/reftests/pagination/content-inserted-000.xhtml
layout/reftests/pagination/content-inserted-001.ref.xhtml
layout/reftests/pagination/content-inserted-001.xhtml
layout/reftests/pagination/content-inserted-002.ref.xhtml
layout/reftests/pagination/content-inserted-002.xhtml
layout/reftests/pagination/content-inserted-003.xhtml
layout/reftests/pagination/content-inserted-004.xhtml
layout/reftests/pagination/content-inserted-005.xhtml
layout/reftests/pagination/content-inserted-006.xhtml
layout/reftests/pagination/content-inserted-007.xhtml
layout/reftests/pagination/content-inserted-008.xhtml
layout/reftests/pagination/content-inserted-009.xhtml
layout/reftests/pagination/dynamic-abspos-overflow-01-cols.xhtml
layout/reftests/pagination/float-clear-000.html
layout/reftests/pagination/float-clear-000.ref.html
layout/reftests/pagination/float-clear-001.html
layout/reftests/pagination/float-clear-002.html
layout/reftests/pagination/float-clear-003.html
layout/reftests/pagination/float-continuations-000.html
layout/reftests/pagination/float-continuations-000.ref.html
layout/reftests/pagination/resize-reflow-000.html
layout/reftests/pagination/resize-reflow-000.ref.html
layout/reftests/pagination/resize-reflow-001.inner.html
layout/reftests/pagination/resize-reflow-001.ref.html
layout/reftests/position-sticky/column-contain-1-ref.html
layout/reftests/position-sticky/column-contain-1a.html
layout/reftests/position-sticky/column-contain-1b.html
layout/reftests/position-sticky/column-contain-2-ref.html
layout/reftests/position-sticky/column-contain-2.html
layout/reftests/table-anonymous-boxes/162063-1.xhtml
layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-001.html
layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-002.html
layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-003.html
layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-004.html
layout/reftests/w3c-css/received/css-multicol-1/multicol-block-clip-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-block-clip-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-br-inside-avoidcolumn-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-break-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-break-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-clip-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-clip-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-collapsing-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-004.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-005.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-006.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-007.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-toolong-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-containing-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-containing-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-004.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-005.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-2-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-2-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-fraction-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-negative-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-height-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-height-block-child-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-001-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-004.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-list-item-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-child-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-column-rule-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-004.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-005.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-overflow-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-overflowing-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-reduce-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-004.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dashed-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dotted-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-double-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-3-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-groove-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-hidden-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-inset-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-large-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-none-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-outset-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-percent-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-px-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ridge-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-samelength-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-shorthand-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-solid-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-groove-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-inset-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-outset-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-ridge-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-shorthand-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-000.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-3-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-bottom-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-3-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-float-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-span-none-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-vertical-align-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-003.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-ref.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-invalid-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-large-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-large-002.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-negative-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-width-small-001.xht
layout/reftests/w3c-css/received/css-multicol-1/multicol-zero-height-001.xht
layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html
layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html
layout/reftests/w3c-css/submitted/multicol3/multicol-height-002.xht
layout/reftests/writing-mode/1079154-1-vertical-rl-columns.html
layout/style/crashtests/368175-1.html
layout/style/crashtests/447783-1.html
layout/style/crashtests/588627-1.html
layout/style/res/forms.css
layout/style/res/ua.css
layout/style/test/test_dont_use_document_colors.html
layout/style/test/test_transitions_events.html
layout/svg/crashtests/409565-1.xhtml
layout/svg/crashtests/767535-1.xhtml
layout/tables/crashtests/331446-1.xhtml
layout/tables/crashtests/362275.html
layout/tables/crashtests/367749.html
layout/tables/crashtests/391898-1.html
layout/tables/crashtests/408753-1.xhtml
layout/tables/crashtests/410428-1.xhtml
layout/tables/crashtests/576890-1.html
layout/tables/crashtests/576890-2.html
layout/tables/crashtests/576890-3.html
layout/tables/crashtests/678447-1.html
layout/xul/crashtests/470272.html
netwerk/test/crashtests/785753-1.html
testing/marionette/harness/marionette/www/test_carets_columns.html
testing/web-platform/tests/2dcontext/tools/current-work-canvas.xhtml
--- a/devtools/client/debugger/new/bundle.js
+++ b/devtools/client/debugger/new/bundle.js
@@ -4847,47 +4847,47 @@ var Debugger =
 	    supports: 0,
 	    values: ["inherit", "initial", "unset", ],
 	  },
 	  "color": {
 	    inherited: true,
 	    supports: 4,
 	    values: ["aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige", "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown", "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue", "cornsilk", "crimson", "currentColor", "cyan", "darkblue", "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkgrey", "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet", "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue", "firebrick", "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew", "hotpink", "hsl", "hsla", "indianred", "indigo", "inherit", "initial", "ivory", "khaki", "lavender", "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey", "lightpink", "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey", "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin", "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered", "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue", "purple", "rebeccapurple", "red", "rgb", "rgba", "rosybrown", "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray", "slategrey", "snow", "springgreen", "steelblue", "tan", "teal", "thistle", "tomato", "transparent", "turquoise", "unset", "violet", "wheat", "white", "whitesmoke", "yellow", "yellowgreen", ],
 	  },
-	  "-moz-column-count": {
+	  "column-count": {
 	    inherited: false,
 	    supports: 1024,
 	    values: ["auto", "inherit", "initial", "unset", ],
 	  },
-	  "-moz-column-fill": {
+	  "column-fill": {
 	    inherited: false,
 	    supports: 0,
 	    values: ["auto", "balance", "inherit", "initial", "unset", ],
 	  },
-	  "-moz-column-width": {
+	  "column-width": {
 	    inherited: false,
 	    supports: 1,
 	    values: ["-moz-calc", "auto", "calc", "inherit", "initial", "unset", ],
 	  },
-	  "-moz-column-gap": {
+	  "column-gap": {
 	    inherited: false,
 	    supports: 1,
 	    values: ["-moz-calc", "calc", "inherit", "initial", "normal", "unset", ],
 	  },
-	  "-moz-column-rule-color": {
+	  "column-rule-color": {
 	    inherited: false,
 	    supports: 4,
 	    values: ["-moz-use-text-color", "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige", "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown", "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue", "cornsilk", "crimson", "currentColor", "cyan", "darkblue", "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkgrey", "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet", "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue", "firebrick", "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew", "hotpink", "hsl", "hsla", "indianred", "indigo", "inherit", "initial", "ivory", "khaki", "lavender", "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey", "lightpink", "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey", "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin", "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered", "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue", "purple", "rebeccapurple", "red", "rgb", "rgba", "rosybrown", "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray", "slategrey", "snow", "springgreen", "steelblue", "tan", "teal", "thistle", "tomato", "transparent", "turquoise", "unset", "violet", "wheat", "white", "whitesmoke", "yellow", "yellowgreen", ],
 	  },
-	  "-moz-column-rule-style": {
+	  "column-rule-style": {
 	    inherited: false,
 	    supports: 0,
 	    values: ["dashed", "dotted", "double", "groove", "hidden", "inherit", "initial", "inset", "none", "outset", "ridge", "solid", "unset", ],
 	  },
-	  "-moz-column-rule-width": {
+	  "column-rule-width": {
 	    inherited: false,
 	    supports: 1,
 	    values: ["-moz-calc", "calc", "inherit", "initial", "medium", "thick", "thin", "unset", ],
 	  },
 	  "contain": {
 	    inherited: false,
 	    supports: 0,
 	    values: ["inherit", "initial", "layout", "none", "paint", "strict", "style", "unset", ],
@@ -5899,17 +5899,17 @@ var Debugger =
 	  },
 	  "-moz-outline-radius": {
 	    subproperties: ["-moz-outline-radius-topleft", "-moz-outline-radius-topright", "-moz-outline-radius-bottomright", "-moz-outline-radius-bottomleft", ],
 	    inherited: false,
 	    supports: 3,
 	    values: ["inherit", "initial", "unset", ],
 	  },
 	  "all": {
-	    subproperties: ["-moz-appearance", "-moz-outline-radius-topleft", "-moz-outline-radius-topright", "-moz-outline-radius-bottomright", "-moz-outline-radius-bottomleft", "-moz-tab-size", "-x-system-font", "animation-delay", "animation-direction", "animation-duration", "animation-fill-mode", "animation-iteration-count", "animation-name", "animation-play-state", "animation-timing-function", "background-attachment", "background-clip", "background-color", "background-image", "background-blend-mode", "background-origin", "background-position", "background-repeat", "background-size", "-moz-binding", "block-size", "border-block-end-color", "border-block-end-style", "border-block-end-width", "border-block-start-color", "border-block-start-style", "border-block-start-width", "border-bottom-color", "-moz-border-bottom-colors", "border-bottom-style", "border-bottom-width", "border-collapse", "border-image-source", "border-image-slice", "border-image-width", "border-image-outset", "border-image-repeat", "border-inline-end-color", "border-inline-end-style", "border-inline-end-width", "border-inline-start-color", "border-inline-start-style", "border-inline-start-width", "border-left-color", "-moz-border-left-colors", "border-left-style", "border-left-width", "border-right-color", "-moz-border-right-colors", "border-right-style", "border-right-width", "border-spacing", "border-top-color", "-moz-border-top-colors", "border-top-style", "border-top-width", "border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius", "border-bottom-left-radius", "bottom", "box-decoration-break", "box-shadow", "box-sizing", "caption-side", "clear", "clip", "color", "-moz-column-count", "-moz-column-fill", "-moz-column-width", "-moz-column-gap", "-moz-column-rule-color", "-moz-column-rule-style", "-moz-column-rule-width", "contain", "content", "-moz-control-character-visibility", "counter-increment", "counter-reset", "cursor", "display", "empty-cells", "align-content", "align-items", "align-self", "flex-basis", "flex-direction", "flex-grow", "flex-shrink", "flex-wrap", "order", "justify-content", "justify-items", "justify-self", "float", "-moz-float-edge", "font-family", "font-feature-settings", "font-kerning", "font-language-override", "font-size", "font-size-adjust", "-moz-osx-font-smoothing", "font-stretch", "font-style", "font-synthesis", "font-variant-alternates", "font-variant-caps", "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric", "font-variant-position", "font-weight", "-moz-force-broken-image-icon", "grid-auto-flow", "grid-auto-columns", "grid-auto-rows", "grid-template-areas", "grid-template-columns", "grid-template-rows", "grid-column-start", "grid-column-end", "grid-row-start", "grid-row-end", "grid-column-gap", "grid-row-gap", "height", "image-orientation", "-moz-image-region", "ime-mode", "inline-size", "left", "letter-spacing", "line-height", "list-style-image", "list-style-position", "list-style-type", "margin-block-end", "margin-block-start", "margin-bottom", "margin-inline-end", "margin-inline-start", "margin-left", "margin-right", "margin-top", "marker-offset", "max-block-size", "max-height", "max-inline-size", "max-width", "-moz-min-font-size-ratio", "min-height", "min-block-size", "min-inline-size", "min-width", "mix-blend-mode", "isolation", "object-fit", "object-position", "offset-block-end", "offset-block-start", "offset-inline-end", "offset-inline-start", "opacity", "-moz-orient", "outline-color", "outline-style", "outline-width", "outline-offset", "overflow-clip-box", "overflow-x", "overflow-y", "padding-block-end", "padding-block-start", "padding-bottom", "padding-inline-end", "padding-inline-start", "padding-left", "padding-right", "padding-top", "page-break-after", "page-break-before", "page-break-inside", "paint-order", "pointer-events", "position", "quotes", "resize", "right", "ruby-align", "ruby-position", "scroll-behavior", "scroll-snap-coordinate", "scroll-snap-destination", "scroll-snap-points-x", "scroll-snap-points-y", "scroll-snap-type-x", "scroll-snap-type-y", "table-layout", "text-align", "-moz-text-align-last", "text-combine-upright", "text-decoration-color", "text-decoration-line", "text-decoration-style", "text-indent", "text-orientation", "text-overflow", "text-shadow", "-moz-text-size-adjust", "text-transform", "transform", "transform-box", "transform-origin", "perspective-origin", "perspective", "transform-style", "backface-visibility", "top", "-moz-top-layer", "touch-action", "transition-delay", "transition-duration", "transition-property", "transition-timing-function", "-moz-user-focus", "-moz-user-input", "-moz-user-modify", "-moz-user-select", "vertical-align", "visibility", "white-space", "width", "-moz-window-dragging", "-moz-window-shadow", "word-break", "word-spacing", "word-wrap", "hyphens", "writing-mode", "z-index", "-moz-box-align", "-moz-box-direction", "-moz-box-flex", "-moz-box-orient", "-moz-box-pack", "-moz-box-ordinal-group", "-moz-stack-sizing", "clip-path", "clip-rule", "color-interpolation", "color-interpolation-filters", "dominant-baseline", "fill", "fill-opacity", "fill-rule", "filter", "flood-color", "flood-opacity", "image-rendering", "lighting-color", "marker-end", "marker-mid", "marker-start", "mask", "mask-type", "shape-rendering", "stop-color", "stop-opacity", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-anchor", "text-rendering", "vector-effect", "will-change", ],
+	    subproperties: ["-moz-appearance", "-moz-outline-radius-topleft", "-moz-outline-radius-topright", "-moz-outline-radius-bottomright", "-moz-outline-radius-bottomleft", "-moz-tab-size", "-x-system-font", "animation-delay", "animation-direction", "animation-duration", "animation-fill-mode", "animation-iteration-count", "animation-name", "animation-play-state", "animation-timing-function", "background-attachment", "background-clip", "background-color", "background-image", "background-blend-mode", "background-origin", "background-position", "background-repeat", "background-size", "-moz-binding", "block-size", "border-block-end-color", "border-block-end-style", "border-block-end-width", "border-block-start-color", "border-block-start-style", "border-block-start-width", "border-bottom-color", "-moz-border-bottom-colors", "border-bottom-style", "border-bottom-width", "border-collapse", "border-image-source", "border-image-slice", "border-image-width", "border-image-outset", "border-image-repeat", "border-inline-end-color", "border-inline-end-style", "border-inline-end-width", "border-inline-start-color", "border-inline-start-style", "border-inline-start-width", "border-left-color", "-moz-border-left-colors", "border-left-style", "border-left-width", "border-right-color", "-moz-border-right-colors", "border-right-style", "border-right-width", "border-spacing", "border-top-color", "-moz-border-top-colors", "border-top-style", "border-top-width", "border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius", "border-bottom-left-radius", "bottom", "box-decoration-break", "box-shadow", "box-sizing", "caption-side", "clear", "clip", "color", "column-count", "column-fill", "column-width", "column-gap", "column-rule-color", "column-rule-style", "column-rule-width", "contain", "content", "-moz-control-character-visibility", "counter-increment", "counter-reset", "cursor", "display", "empty-cells", "align-content", "align-items", "align-self", "flex-basis", "flex-direction", "flex-grow", "flex-shrink", "flex-wrap", "order", "justify-content", "justify-items", "justify-self", "float", "-moz-float-edge", "font-family", "font-feature-settings", "font-kerning", "font-language-override", "font-size", "font-size-adjust", "-moz-osx-font-smoothing", "font-stretch", "font-style", "font-synthesis", "font-variant-alternates", "font-variant-caps", "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric", "font-variant-position", "font-weight", "-moz-force-broken-image-icon", "grid-auto-flow", "grid-auto-columns", "grid-auto-rows", "grid-template-areas", "grid-template-columns", "grid-template-rows", "grid-column-start", "grid-column-end", "grid-row-start", "grid-row-end", "grid-column-gap", "grid-row-gap", "height", "image-orientation", "-moz-image-region", "ime-mode", "inline-size", "left", "letter-spacing", "line-height", "list-style-image", "list-style-position", "list-style-type", "margin-block-end", "margin-block-start", "margin-bottom", "margin-inline-end", "margin-inline-start", "margin-left", "margin-right", "margin-top", "marker-offset", "max-block-size", "max-height", "max-inline-size", "max-width", "-moz-min-font-size-ratio", "min-height", "min-block-size", "min-inline-size", "min-width", "mix-blend-mode", "isolation", "object-fit", "object-position", "offset-block-end", "offset-block-start", "offset-inline-end", "offset-inline-start", "opacity", "-moz-orient", "outline-color", "outline-style", "outline-width", "outline-offset", "overflow-clip-box", "overflow-x", "overflow-y", "padding-block-end", "padding-block-start", "padding-bottom", "padding-inline-end", "padding-inline-start", "padding-left", "padding-right", "padding-top", "page-break-after", "page-break-before", "page-break-inside", "paint-order", "pointer-events", "position", "quotes", "resize", "right", "ruby-align", "ruby-position", "scroll-behavior", "scroll-snap-coordinate", "scroll-snap-destination", "scroll-snap-points-x", "scroll-snap-points-y", "scroll-snap-type-x", "scroll-snap-type-y", "table-layout", "text-align", "-moz-text-align-last", "text-combine-upright", "text-decoration-color", "text-decoration-line", "text-decoration-style", "text-indent", "text-orientation", "text-overflow", "text-shadow", "-moz-text-size-adjust", "text-transform", "transform", "transform-box", "transform-origin", "perspective-origin", "perspective", "transform-style", "backface-visibility", "top", "-moz-top-layer", "touch-action", "transition-delay", "transition-duration", "transition-property", "transition-timing-function", "-moz-user-focus", "-moz-user-input", "-moz-user-modify", "-moz-user-select", "vertical-align", "visibility", "white-space", "width", "-moz-window-dragging", "-moz-window-shadow", "word-break", "word-spacing", "word-wrap", "hyphens", "writing-mode", "z-index", "-moz-box-align", "-moz-box-direction", "-moz-box-flex", "-moz-box-orient", "-moz-box-pack", "-moz-box-ordinal-group", "-moz-stack-sizing", "clip-path", "clip-rule", "color-interpolation", "color-interpolation-filters", "dominant-baseline", "fill", "fill-opacity", "fill-rule", "filter", "flood-color", "flood-opacity", "image-rendering", "lighting-color", "marker-end", "marker-mid", "marker-start", "mask", "mask-type", "shape-rendering", "stop-color", "stop-opacity", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-anchor", "text-rendering", "vector-effect", "will-change", ],
 	    inherited: false,
 	    supports: 2015,
 	    values: ["-moz-all", "-moz-available", "-moz-block-height", "-moz-box", "-moz-calc", "-moz-center", "-moz-crisp-edges", "-moz-deck", "-moz-element", "-moz-fit-content", "-moz-grid", "-moz-grid-group", "-moz-grid-line", "-moz-groupbox", "-moz-gtk-info-bar", "-moz-hidden-unscrollable", "-moz-image-rect", "-moz-inline-box", "-moz-inline-grid", "-moz-inline-stack", "-moz-left", "-moz-linear-gradient", "-moz-mac-disclosure-button-closed", "-moz-mac-disclosure-button-open", "-moz-mac-fullscreen-button", "-moz-mac-help-button", "-moz-mac-vibrancy-dark", "-moz-mac-vibrancy-light", "-moz-max-content", "-moz-middle-with-baseline", "-moz-min-content", "-moz-none", "-moz-popup", "-moz-pre-space", "-moz-radial-gradient", "-moz-repeating-linear-gradient", "-moz-repeating-radial-gradient", "-moz-right", "-moz-stack", "-moz-text", "-moz-use-text-color", "-moz-win-borderless-glass", "-moz-win-browsertabbar-toolbox", "-moz-win-communications-toolbox", "-moz-win-exclude-glass", "-moz-win-glass", "-moz-win-media-toolbox", "-moz-window-button-box", "-moz-window-button-box-maximized", "-moz-window-button-close", "-moz-window-button-maximize", "-moz-window-button-minimize", "-moz-window-button-restore", "-moz-window-frame-bottom", "-moz-window-frame-left", "-moz-window-frame-right", "-moz-window-titlebar", "-moz-window-titlebar-maximized", "absolute", "active", "aliceblue", "all", "all-petite-caps", "all-small-caps", "alpha", "alphabetic", "alternate", "alternate-reverse", "always", "antiquewhite", "aqua", "aquamarine", "auto", "avoid", "azure", "backwards", "balance", "baseline", "beige", "bevel", "bisque", "black", "blanchedalmond", "block", "block-axis", "blue", "blueviolet", "border-box", "both", "bottom", "bottom-outside", "break-all", "break-word", "brown", "burlywood", "butt", "button", "button-arrow-down", "button-arrow-next", "button-arrow-previous", "button-arrow-up", "button-bevel", "button-focus", "cadetblue", "calc", "capitalize", "caret", "center", "central", "chartreuse", "checkbox", "checkbox-container", "checkbox-label", "checkmenuitem", "chocolate", "clone", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse", "condensed", "contain", "content-box", "contents", "coral", "cornflowerblue", "cornsilk", "cover", "crimson", "crispedges", "cubic-bezier", "currentColor", "cyan", "darkblue", "darkcyan", "darken", "darkgoldenrod", "darkgray", "darkgreen", "darkgrey", "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet", "dashed", "deeppink", "deepskyblue", "dialog", "difference", "dimgray", "dimgrey", "disabled", "dodgerblue", "dotted", "double", "drag", "dualbutton", "ease", "ease-in", "ease-in-out", "ease-out", "element", "elements", "enabled", "end", "evenodd", "exclusion", "expanded", "extra-condensed", "extra-expanded", "fill", "fill-box", "firebrick", "fixed", "flat", "flex", "floralwhite", "forestgreen", "forwards", "fuchsia", "full-width", "gainsboro", "geometricprecision", "ghostwhite", "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "grid", "groove", "groupbox", "hanging", "hard-light", "hidden", "hide", "honeydew", "horizontal", "horizontal-tb", "hotpink", "hsl", "hsla", "hue", "ideographic", "ignore", "inactive", "indianred", "indigo", "infinite", "inherit", "initial", "inline", "inline-axis", "inline-block", "inline-end", "inline-flex", "inline-grid", "inline-start", "inline-table", "inset", "inside", "isolate", "italic", "ivory", "justify", "keep-all", "khaki", "large", "larger", "lavender", "lavenderblush", "lawngreen", "layout", "left", "lemonchiffon", "lightblue", "lightcoral", "lightcyan", "lighten", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey", "lightpink", "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey", "lightsteelblue", "lightyellow", "lime", "limegreen", "linear", "linear-gradient", "linearrgb", "linen", "list-item", "listbox", "listitem", "local", "lowercase", "lr", "lr-tb", "luminance", "luminosity", "magenta", "mandatory", "manual", "margin-box", "maroon", "mathematical", "medium", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", "mediumvioletred", "menuarrow", "menubar", "menucheckbox", "menuimage", "menuitem", "menuitemtext", "menulist", "menulist-button", "menulist-text", "menulist-textfield", "menupopup", "menuradio", "menuseparator", "meterbar", "meterchunk", "middle", "midnightblue", "mintcream", "mistyrose", "miter", "mixed", "moccasin", "multiply", "navajowhite", "navy", "no-change", "no-drag", "no-repeat", "non-scaling-stroke", "none", "nonzero", "normal", "nowrap", "number-input", "oblique", "oldlace", "olive", "olivedrab", "optimizelegibility", "optimizequality", "optimizespeed", "orange", "orangered", "orchid", "outset", "outside", "over", "overlay", "padding-box", "paint", "painted", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", "papayawhip", "paused", "peachpuff", "peru", "petite-caps", "pink", "plum", "powderblue", "pre", "pre-line", "pre-wrap", "preserve-3d", "progressbar", "progressbar-vertical", "progresschunk", "progresschunk-vertical", "proximity", "purple", "radial-gradient", "radio", "radio-container", "radio-label", "radiomenuitem", "range", "range-thumb", "read-only", "read-write", "rebeccapurple", "red", "relative", "repeat", "repeat-x", "repeat-y", "repeating-linear-gradient", "repeating-radial-gradient", "reset-size", "resizer", "resizerpanel", "reverse", "rgb", "rgba", "ridge", "right", "rl", "rl-tb", "rosybrown", "round", "row", "row-reverse", "royalblue", "ruby", "ruby-base", "ruby-base-container", "ruby-text", "ruby-text-container", "running", "saddlebrown", "salmon", "sandybrown", "saturation", "scale-down", "scale-horizontal", "scale-vertical", "scalethumb-horizontal", "scalethumb-vertical", "scalethumbend", "scalethumbstart", "scalethumbtick", "screen", "scroll", "scrollbar", "scrollbar-small", "scrollbarbutton-down", "scrollbarbutton-left", "scrollbarbutton-right", "scrollbarbutton-up", "scrollbarthumb-horizontal", "scrollbarthumb-vertical", "scrollbartrack-horizontal", "scrollbartrack-vertical", "seagreen", "searchfield", "seashell", "select-after", "select-all", "select-before", "select-menu", "select-same", "semi-condensed", "semi-expanded", "separate", "separator", "show", "sideways", "sideways-lr", "sideways-right", "sideways-rl", "sienna", "silver", "skyblue", "slateblue", "slategray", "slategrey", "slice", "small", "small-caps", "smaller", "smooth", "snow", "soft-light", "solid", "space-around", "space-between", "spinner", "spinner-downbutton", "spinner-textfield", "spinner-upbutton", "splitter", "springgreen", "square", "srgb", "start", "static", "statusbar", "statusbarpanel", "steelblue", "step-end", "step-start", "steps", "sticky", "stretch", "stretch-to-fit", "strict", "stroke", "style", "sub", "super", "tab", "tab-scroll-arrow-back", "tab-scroll-arrow-forward", "table", "table-caption", "table-cell", "table-column", "table-column-group", "table-footer-group", "table-header-group", "table-row", "table-row-group", "tabpanel", "tabpanels", "tan", "tb", "tb-rl", "teal", "text", "text-after-edge", "text-before-edge", "text-bottom", "text-top", "textfield", "textfield-multiline", "thick", "thin", "thistle", "titling-caps", "toggle", "tomato", "toolbar", "toolbarbutton", "toolbarbutton-dropdown", "toolbargripper", "toolbox", "tooltip", "top", "top-outside", "transparent", "treeheader", "treeheadercell", "treeheadersortarrow", "treeitem", "treeline", "treetwisty", "treetwistyopen", "treeview", "tri-state", "turquoise", "ultra-condensed", "ultra-expanded", "under", "unicase", "unset", "uppercase", "upright", "url", "use-script", "vertical", "vertical-lr", "vertical-rl", "view-box", "violet", "visible", "visiblefill", "visiblepainted", "visiblestroke", "wavy", "wheat", "white", "whitesmoke", "window", "wrap", "wrap-reverse", "write-only", "x-large", "x-small", "xx-large", "xx-small", "yellow", "yellowgreen", ],
 	  },
 	  "animation": {
 	    subproperties: ["animation-duration", "animation-timing-function", "animation-delay", "animation-direction", "animation-fill-mode", "animation-iteration-count", "animation-play-state", "animation-name", ],
 	    inherited: false,
 	    supports: 1344,
@@ -6000,24 +6000,24 @@ var Debugger =
 	    values: ["-moz-calc", "calc", "inherit", "initial", "medium", "thick", "thin", "unset", ],
 	  },
 	  "border-radius": {
 	    subproperties: ["border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius", "border-bottom-left-radius", ],
 	    inherited: false,
 	    supports: 3,
 	    values: ["inherit", "initial", "unset", ],
 	  },
-	  "-moz-columns": {
-	    subproperties: ["-moz-column-count", "-moz-column-width", ],
+	  "columns": {
+	    subproperties: ["column-count", "column-width", ],
 	    inherited: false,
 	    supports: 1025,
 	    values: ["-moz-calc", "auto", "calc", "inherit", "initial", "unset", ],
 	  },
-	  "-moz-column-rule": {
-	    subproperties: ["-moz-column-rule-width", "-moz-column-rule-style", "-moz-column-rule-color", ],
+	  "column-rule": {
+	    subproperties: ["column-rule-width", "column-rule-style", "column-rule-color", ],
 	    inherited: false,
 	    supports: 5,
 	    values: ["-moz-calc", "-moz-use-text-color", "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige", "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown", "burlywood", "cadetblue", "calc", "chartreuse", "chocolate", "coral", "cornflowerblue", "cornsilk", "crimson", "currentColor", "cyan", "darkblue", "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkgrey", "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet", "dashed", "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue", "dotted", "double", "firebrick", "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "groove", "hidden", "honeydew", "hotpink", "hsl", "hsla", "indianred", "indigo", "inherit", "initial", "inset", "ivory", "khaki", "lavender", "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey", "lightpink", "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey", "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", "maroon", "medium", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin", "navajowhite", "navy", "none", "oldlace", "olive", "olivedrab", "orange", "orangered", "orchid", "outset", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue", "purple", "rebeccapurple", "red", "rgb", "rgba", "ridge", "rosybrown", "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray", "slategrey", "snow", "solid", "springgreen", "steelblue", "tan", "teal", "thick", "thin", "thistle", "tomato", "transparent", "turquoise", "unset", "violet", "wheat", "white", "whitesmoke", "yellow", "yellowgreen", ],
 	  },
 	  "flex": {
 	    subproperties: ["flex-grow", "flex-shrink", "flex-basis", ],
 	    inherited: false,
 	    supports: 1027,
@@ -45208,9 +45208,9 @@ var Debugger =
 /***/ },
 /* 436 */
 /***/ function(module, exports) {
 
 	// removed by extract-text-webpack-plugin
 
 /***/ }
 /******/ ]);
-//# sourceMappingURL=bundle.js.map
\ No newline at end of file
+//# sourceMappingURL=bundle.js.map
--- a/devtools/client/themes/styleeditor.css
+++ b/devtools/client/themes/styleeditor.css
@@ -316,17 +316,17 @@ h3 {
   padding: 0 10px;
   overflow-x: hidden;
   overflow-y: auto;
   -moz-box-flex: 1;
 }
 
 .csscoverage-report-content {
   margin: 20px auto;
-  -moz-column-width: 300px;
+  column-width: 300px;
   font-size: 13px;
   -moz-user-select: text;
 }
 
 .csscoverage-report-summary,
 .csscoverage-report-unused,
 .csscoverage-report-optimize {
   display: inline-block;
--- a/dom/grid/test/chrome/test_grid_fragmentation.html
+++ b/dom/grid/test/chrome/test_grid_fragmentation.html
@@ -16,21 +16,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/dom/tests/mochitest/general/test_clientRects.html
+++ b/dom/tests/mochitest/general/test_clientRects.html
@@ -50,17 +50,17 @@ function checkElement(id, list, eps, doc
   }
   checkRect(e.getBoundingClientRect(), bounds, eps, "getBoundingClientRect()", " for element '" + id + "'");
 }
 </script>
 
 <!-- Simple case -->
 <div id="d1" style="position:absolute; left:50px; top:50px; width:20px; height:30px; background:pink;"></div>
 <!-- Multiple boxes -->
-<div style="position:absolute; left:50px; top:100px; width:400px; height:100px; -moz-column-count:2; -moz-column-gap:0; column-count:2; column-gap:0">
+<div style="position:absolute; left:50px; top:100px; width:400px; height:100px; column-count:2; column-gap:0; column-count:2; column-gap:0">
   <div id="d2">
     <div style="width:200px; height:100px; background:yellow"></div>
     <div style="width:200px; height:100px; background:lime"></div>
   </div>
 </div>
 <!-- No boxes -->
 <div id="d3" style="display:none"></div>
 <!-- Element in transform -->
--- a/gfx/tests/crashtests/768079-1.html
+++ b/gfx/tests/crashtests/768079-1.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <html style="-moz-perspective: 7000px; overflow: hidden;">
-<body style="overflow: hidden; -moz-transform: rotateX(30deg); border-radius: 1px; -moz-columns: 2 10px; visibility: collapse;">X</body>
+<body style="overflow: hidden; -moz-transform: rotateX(30deg); border-radius: 1px; columns: 2 10px; visibility: collapse;">X</body>
 </html>
--- a/layout/base/crashtests/337419-1.html
+++ b/layout/base/crashtests/337419-1.html
@@ -1,14 +1,14 @@
 <html>
 <head>
 
 <style>
 #container {
-	-moz-column-count: 3;
+	column-count: 3;
 }
 #right {
 	float: right;
     overflow: hidden;
 }
 </style>
 
 <link rel="alternate" type="application/atom+xml" title="Atom" href="http://weblogs.mozillazine.org/roc/atom.xml" />
--- a/layout/base/crashtests/386266-1.html
+++ b/layout/base/crashtests/386266-1.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 
 <style>
 #outer { 
-  -moz-column-count: 2;
+  column-count: 2;
 }
 #inner {
   border: 1px solid green;
 }
 </style>
 
 <style id="s">
 #inner { 
--- a/layout/base/crashtests/397011-1.xhtml
+++ b/layout/base/crashtests/397011-1.xhtml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 </head>
 <body>
 
 <div style="text-indent: 11.2px;">
-  <div style="-moz-column-count: 2;">
+  <div style="column-count: 2;">
     <span style="float: left;"></span>
   </div>
 </div>
 
 </body>
 </html>
--- a/layout/base/crashtests/399687-1.html
+++ b/layout/base/crashtests/399687-1.html
@@ -1,17 +1,17 @@
 <html>
 <head>
 <style>
 
 #colset {
   width: 300pt;
   height: 2in;
-  -moz-column-count: 3;
-  -moz-column-gap: 0;
+  column-count: 3;
+  column-gap: 0;
 }
 
 .ocontainer {
   height: 0;
 }
 
 .overflow {
   height: 5in;
--- a/layout/base/crashtests/401734-1.html
+++ b/layout/base/crashtests/401734-1.html
@@ -1,17 +1,17 @@
 <html><head>
 <script>
 function doe(){
 document.getElementById('a').style.display = 'none';
 }
 </script>
 </head>
 <body onload="document.body.offsetHeight; setTimeout(doe,0)">
-<div style="-moz-column-count: 2;width: 400px;">
+<div style="column-count: 2;width: 400px;">
 <span id="a">
-<span style="float: left; -moz-column-width: 100px;">
+<span style="float: left; column-width: 100px;">
 &#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;-&#1593;
 </span>
 </span>
 </div>
 </body>
 </html>
--- a/layout/base/crashtests/401734-2.html
+++ b/layout/base/crashtests/401734-2.html
@@ -1,17 +1,17 @@
 <html><head>
 <script>
 function doe(){
 document.getElementById('a').style.display = 'none';
 }
 </script>
 </head>
 <body onload="document.body.offsetHeight; setTimeout(doe,0)">
-<div style="-moz-column-count: 2;width: 400px;">
+<div style="column-count: 2;width: 400px;">
 <span id="a">
-<span style="float: left; -moz-column-width: 100px;">
+<span style="float: left; column-width: 100px;">
 a-a-a-a-a-a-a-a-a-a-a-a-a-a
 </span>
 </span>
 </div>
 </body>
 </html>
--- a/layout/base/crashtests/403569-1.xhtml
+++ b/layout/base/crashtests/403569-1.xhtml
@@ -1,23 +1,23 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style>
 
 #a {
-  -moz-column-count: 2;
-  -moz-column-width: 100px;
+  column-count: 2;
+  column-width: 100px;
   float: left;
   border: 2px solid magenta;
   height: 200px;
 }
 
 #b {
-  -moz-column-count: 2;
-  -moz-column-width: 100px;
+  column-count: 2;
+  column-width: 100px;
   float: left;
   border: 2px solid green;
   height: 300px;
 }
 
 </style>
 </head>
 
--- a/layout/base/crashtests/403569-2.xhtml
+++ b/layout/base/crashtests/403569-2.xhtml
@@ -1,14 +1,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style>
 body {
-  -moz-column-count: 2;
-  -moz-column-width: 100px;
+  column-count: 2;
+  column-width: 100px;
   height: 200px;
 }
 #b {
   float: left;
   height: 300px;
 }
 </style>
 </head>
--- a/layout/base/crashtests/403569-3.xhtml
+++ b/layout/base/crashtests/403569-3.xhtml
@@ -1,14 +1,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style>
 body {
-  -moz-column-count: 2;
-  -moz-column-width: 100px;
+  column-count: 2;
+  column-width: 100px;
   height: 200px;
 }
 #b {
   float: left;
   height: 300px;
 }
 
 .og:before {
--- a/layout/base/crashtests/404721-1.xhtml
+++ b/layout/base/crashtests/404721-1.xhtml
@@ -6,12 +6,12 @@ function boom()
   var s = document.getElementById("s");
   s.parentNode.removeChild(s);
 }
 </script>
 </head>
 
 <body onload="boom();">
 
-<div style="-moz-column-width: 23px;"><div style="padding: 5px;"><span id="s"><div style="float: left;"><div style="width: 100px; height: 100px;"></div></div></span></div></div>
+<div style="column-width: 23px;"><div style="padding: 5px;"><span id="s"><div style="float: left;"><div style="width: 100px; height: 100px;"></div></div></span></div></div>
                         
 </body>
 </html>
--- a/layout/base/crashtests/404721-2.xhtml
+++ b/layout/base/crashtests/404721-2.xhtml
@@ -6,13 +6,13 @@ function boom()
   var s = document.getElementById("s");
   s.parentNode.removeChild(s);
 }
 </script>
 </head>
 
 <body onload="boom();">
 
-<div style="-moz-column-width: 23px;"><div style="padding: 5px;"><div id="s"><td style="float: left;"><div style="width: 100px; height: 100px;"></div>
+<div style="column-width: 23px;"><div style="padding: 5px;"><div id="s"><td style="float: left;"><div style="width: 100px; height: 100px;"></div>
                         </td></div></div></div>
                         
 </body>
 </html>
--- a/layout/base/crashtests/408292.html
+++ b/layout/base/crashtests/408292.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <style>
 #v {
-  -moz-column-count: 2;
+  column-count: 2;
   width: 10ch;
   height: 3.7em;
   font: 14px monospace;
   text-transform: lowercase;
   direction: rtl;
   border: 1px solid black;
 }
 </style>
--- a/layout/base/crashtests/408299.html
+++ b/layout/base/crashtests/408299.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 </head>
 
 <body style="direction: rtl; font-family: monospace;" onload="document.getElementById('v').style.width = '0';">
 
-<div id="v" style="-moz-column-count: 15; width: 1px; height: 2.7em; border: 1px solid black;">
+<div id="v" style="column-count: 15; width: 1px; height: 2.7em; border: 1px solid black;">
 xxxxx yyyyy zzzzzz
 </div>
 
 </body>
 </html>
--- a/layout/base/crashtests/408450-1.xhtml
+++ b/layout/base/crashtests/408450-1.xhtml
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 </head>
 <body>
-<div style="-moz-column-count: 15;"><div style="-moz-column-count: 15;"><td style="display: block; height: 2.5em;"><div style="height: 0.5em;"></div></td></div></div>
+<div style="column-count: 15;"><div style="column-count: 15;"><td style="display: block; height: 2.5em;"><div style="height: 0.5em;"></div></td></div></div>
 </body>
 </html>
--- a/layout/base/crashtests/411870-1.html
+++ b/layout/base/crashtests/411870-1.html
@@ -5,14 +5,14 @@
 function boom()
 {
   document.body.appendChild(document.getElementById("v").firstChild);
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="white-space: pre; -moz-column-count: -1;"><div id="v"><span>
+<body onload="boom();" style="white-space: pre; column-count: -1;"><div id="v"><span>
 </span>
 
 </div></body>
 
 </html>
--- a/layout/base/crashtests/420031-1.html
+++ b/layout/base/crashtests/420031-1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 <body onload="var s = document.getElementById('s'); s.parentNode.removeChild(s);">
-<div style="height: 4em; -moz-column-count: 1;"><br><span id="s">foo<div style="float: right;">bar<div></div> baz</div></span></div>
+<div style="height: 4em; column-count: 1;"><br><span id="s">foo<div style="float: right;">bar<div></div> baz</div></span></div>
 </body>
 </html>
--- a/layout/base/crashtests/420213-1.html
+++ b/layout/base/crashtests/420213-1.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
-<body onload="document.body.style.width = '5px';"><div style="-moz-column-width: 1px;">X<span style="height: 10px; float: right;"></span></div></body>
+<body onload="document.body.style.width = '5px';"><div style="column-width: 1px;">X<span style="height: 10px; float: right;"></span></div></body>
 </html>
--- a/layout/base/crashtests/420651-1.xhtml
+++ b/layout/base/crashtests/420651-1.xhtml
@@ -1,4 +1,4 @@
-<html xmlns="http://www.w3.org/1999/xhtml"><body style="-moz-column-count: 1; width: 10em; white-space: pre;">
+<html xmlns="http://www.w3.org/1999/xhtml"><body style="column-count: 1; width: 10em; white-space: pre;">
     <div style="padding: 12em; display: inline; white-space: normal;">
       <input style="float: right;"></input></div>
   </body></html>
--- a/layout/base/crashtests/423107-1.xhtml
+++ b/layout/base/crashtests/423107-1.xhtml
@@ -9,11 +9,11 @@ function boom()
   document.body.removeChild(a);
   document.body.offsetHeight;
   document.body.appendChild(a);
 }
 
 </script>
 </head>
 
-<body style="-moz-column-count: 3;" onload="boom();">1<div style="height: 1em;"></div><div id="a">2<select style="float: right;"></select></div></body>
+<body style="column-count: 3;" onload="boom();">1<div style="height: 1em;"></div><div id="a">2<select style="float: right;"></select></div></body>
 
 </html>
--- a/layout/base/crashtests/425981-1.html
+++ b/layout/base/crashtests/425981-1.html
@@ -9,10 +9,10 @@ function boom()
 {
   var v = document.getElementById("v");
   var t = v.firstChild;
   v.appendChild(document.createTextNode(" "));
   v.removeChild(t);
 }
 </script>
 </head>
-<body onload="boom();"><div id="v" style="-moz-column-count: 2; width: 1px;">a b</div></body>
+<body onload="boom();"><div id="v" style="column-count: 2; width: 1px;">a b</div></body>
 </html>
--- a/layout/base/crashtests/428448-1.html
+++ b/layout/base/crashtests/428448-1.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head></head>
 
-<body style="-moz-column-width: 1px"><span>!</span>
+<body style="column-width: 1px"><span>!</span>
 <span style="float: left"></span>
 x</body>
 
 </html>
--- a/layout/base/crashtests/429881.html
+++ b/layout/base/crashtests/429881.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head></head>
-<body style="position: relative; -moz-column-width: 5em;" onload="document.body.removeChild(document.body.firstChild)"><div id="d"><div style="white-space: pre; position: absolute;">
+<body style="position: relative; column-width: 5em;" onload="document.body.removeChild(document.body.firstChild)"><div id="d"><div style="white-space: pre; position: absolute;">
 B<div style="position: fixed;"></div></div></div></body>
 </html>
--- a/layout/base/crashtests/430569-1.html
+++ b/layout/base/crashtests/430569-1.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html>
-<html style="height: 12px; white-space: pre;"><body style="position: fixed; height: inherit; -moz-column-width: 1px;" onload="document.documentElement.style.height = '';"><div></div>
+<html style="height: 12px; white-space: pre;"><body style="position: fixed; height: inherit; column-width: 1px;" onload="document.documentElement.style.height = '';"><div></div>
 </body></html>
--- a/layout/base/crashtests/430569-2.html
+++ b/layout/base/crashtests/430569-2.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- This height has to be less than 18px to trigger crash, on Linux. -->
 <html   style="height:      10px;
                background:  lightblue"
  ><body style="position:    fixed;
                height:      inherit;
-               -moz-column-count: 1;
+               column-count: 1;
                background: yellow;
                width: 100px"
         onload="document.documentElement.style.height = ''"
   ><div style="outline: 1px dotted green"></div><br/></body></html>
--- a/layout/base/crashtests/433450-1.html
+++ b/layout/base/crashtests/433450-1.html
@@ -9,11 +9,11 @@ function boom()
   document.getElementById("v").style.border = "1px solid blue";
   document.getElementById("li").style.padding = "5px 7px";
 }
 
 </script>
 
 </head>
 
-<body onload="boom();"><div style="-moz-column-count: 2;"><div style="margin-bottom: 5px;" id="v"></div><li id="li" style="border: 1px solid green;">
+<body onload="boom();"><div style="column-count: 2;"><div style="margin-bottom: 5px;" id="v"></div><li id="li" style="border: 1px solid green;">
 <span style="border: 1px solid red; float: left;"></span></li></div></body>
 </html>
--- a/layout/base/crashtests/455063-3.html
+++ b/layout/base/crashtests/455063-3.html
@@ -1,6 +1,6 @@
-<html style="display:block;-moz-column-count:2;column-count:2;">
+<html style="display:block;column-count:2;column-count:2;">
 <body>
   <span><div></div></span>
 </body>
 
 </html>
--- a/layout/base/crashtests/460389-1.html
+++ b/layout/base/crashtests/460389-1.html
@@ -1,6 +1,6 @@
 <html>
 <head><style id="s">div:first-letter { float: left; }</style></head>
 <body onload="document.getElementById('s').disabled = true;">
-<div style="-moz-column-count: 2;"> &#x06CD;<div>T</div></div>
+<div style="column-count: 2;"> &#x06CD;<div>T</div></div>
 </body>
 </html>
--- a/layout/base/crashtests/468563-1.html
+++ b/layout/base/crashtests/468563-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head></head>
 <body onload="document.getElementById('d').style.MozColumnWidth = '';">
-<div id="d" style="height: 1px; -moz-column-width: 1px;">d d <span style="position: absolute;"></span></div>
+<div id="d" style="height: 1px; column-width: 1px;">d d <span style="position: absolute;"></span></div>
 </body>
 </html>
--- a/layout/base/crashtests/468578-1.xhtml
+++ b/layout/base/crashtests/468578-1.xhtml
@@ -11,11 +11,11 @@ function boom()
   legend.removeChild(legend.firstChild);
   document.body.removeChild(legend);
 }
 
 // ]]>
 </script>
 </head>
 
-<body onload="boom();" style="-moz-column-width: 0pc;"><legend id="legend" style="white-space: pre-line; padding-bottom: 90px; display: block;">
+<body onload="boom();" style="column-width: 0pc;"><legend id="legend" style="white-space: pre-line; padding-bottom: 90px; display: block;">
     </legend></body>
 </html>
--- a/layout/base/crashtests/474075.html
+++ b/layout/base/crashtests/474075.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head></head>
 
 <body onload="document.getElementById('a').style.fontWeight = 'bold';document.documentElement.offsetHeight;">
 
-<div style="top: -2px; bottom: -8px; position: fixed; -moz-column-count: 1;"><div id="a" style="float: right; padding: 800px;"></div><div><div style="clear: right;"><div style="font-size-adjust: 1073741823; white-space: pre;">
+<div style="top: -2px; bottom: -8px; position: fixed; column-count: 1;"><div id="a" style="float: right; padding: 800px;"></div><div><div style="clear: right;"><div style="font-size-adjust: 1073741823; white-space: pre;">
 <input style="position: fixed;"></div></div></div></div>
 
 </body>
 
 </html>
--- a/layout/base/crashtests/477731-1.html
+++ b/layout/base/crashtests/477731-1.html
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style type="text/css">body:first-letter { float: left; }</style>
 </head>
-<body style="-moz-column-width: 100000px;" onload="document.body.style.MozColumnWidth='';"> &#x08D9;</body>
+<body style="column-width: 100000px;" onload="document.body.style.MozColumnWidth='';"> &#x08D9;</body>
 </html>
--- a/layout/base/crashtests/480686-1.html
+++ b/layout/base/crashtests/480686-1.html
@@ -3,11 +3,11 @@
 <head>
 <style type="text/css">
 
 span { background: url(../../../testing/crashtest/images/tree.gif); }
 
 </style>
 </head>
 
-<body><div style="direction: rtl;"><div style="-moz-column-width: 1px;"><span>Q<input></span></div></div></body>
+<body><div style="direction: rtl;"><div style="column-width: 1px;"><span>Q<input></span></div></div></body>
 
 </html>
--- a/layout/base/crashtests/499741-1.xhtml
+++ b/layout/base/crashtests/499741-1.xhtml
@@ -1,1 +1,1 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="-moz-column-width: 1px;">a<div><span><wbr/>a<select/></span></div></html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="column-width: 1px;">a<div><span><wbr/>a<select/></span></div></html>
--- a/layout/base/crashtests/499858-1.xhtml
+++ b/layout/base/crashtests/499858-1.xhtml
@@ -1,5 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="word-wrap: break-word; padding: 0pt 3870px; position: relative; -moz-column-count: 3;">
+<html xmlns="http://www.w3.org/1999/xhtml" style="word-wrap: break-word; padding: 0pt 3870px; position: relative; column-count: 3;">
 <body onload="document.documentElement.style.visibility='hidden';">
 <div>,,, <span style="position: absolute;"><div/>2</span></div>
 </body>
 </html>
--- a/layout/base/crashtests/534368-1.xhtml
+++ b/layout/base/crashtests/534368-1.xhtml
@@ -1,9 +1,9 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="position: absolute; font-size: 1000px; -moz-column-count: 3;">
+<html xmlns="http://www.w3.org/1999/xhtml" style="position: absolute; font-size: 1000px; column-count: 3;">
 <script>
 
 function boom()
 {
   var newSS = document.createElementNS("http://www.w3.org/1999/xhtml", "style");
   newSS.appendChild(document.createTextNode("whattheheck:first-line {}"));
   document.getElementById("h").appendChild(newSS);
 }
--- a/layout/base/crashtests/535911-1.xhtml
+++ b/layout/base/crashtests/535911-1.xhtml
@@ -7,10 +7,10 @@ function boom()
     var s = document.createElementNS("http://www.w3.org/1999/xhtml", "span");
     var b = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "box");
     s.appendChild(b);
     document.getElementById("a").appendChild(s); 
 }
 
 </script>
 </head>
-<body onload="boom();" style="-moz-column-width: 1px;"><span id="a"><box xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/></span><div>Hello</div></body>
+<body onload="boom();" style="column-width: 1px;"><span id="a"><box xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/></span><div>Hello</div></body>
 </html>
--- a/layout/base/crashtests/537562-1.xhtml
+++ b/layout/base/crashtests/537562-1.xhtml
@@ -1,10 +1,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" id="a">
 <head>
 <style>
-#a { -moz-column-count: 2; }
+#a { column-count: 2; }
 #a:first-letter { }
 </style>
 </head>
 <body id="b" onload="document.getElementById('b').appendChild(document.createElement('tr'));"></body>
 X
 </html>
--- a/layout/base/crashtests/537631-1.html
+++ b/layout/base/crashtests/537631-1.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <html>
 <head></head>
-<body style="position: fixed; -moz-column-count: 2;"><div style="position: absolute; height: 7em;"><br><br></div></body>
+<body style="position: fixed; column-count: 2;"><div style="position: absolute; height: 7em;"><br><br></div></body>
 </html>
--- a/layout/base/crashtests/538267-1.html
+++ b/layout/base/crashtests/538267-1.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <style>
 div:first-letter { float: left; } 
-div { -moz-column-count: 2; width: 0; }
+div { column-count: 2; width: 0; }
 </style>
 <script>
 function boom()
 {
   var v = document.getElementById("v");
   v.removeChild(v.firstChild);
 }
 </script>
--- a/layout/base/crashtests/576649-1.html
+++ b/layout/base/crashtests/576649-1.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <html>
-<body onload="document.getElementById('p').style.fontWeight = 'bold';" style="letter-spacing: 2251799813685247pt; -moz-column-count: 11; position: absolute;"><p id="p"><span style="position: absolute;">C d s</span></p></body>
+<body onload="document.getElementById('p').style.fontWeight = 'bold';" style="letter-spacing: 2251799813685247pt; column-count: 11; position: absolute;"><p id="p"><span style="position: absolute;">C d s</span></p></body>
 </html>
--- a/layout/base/crashtests/580129-1.html
+++ b/layout/base/crashtests/580129-1.html
@@ -1,17 +1,17 @@
 <html>
 <head>
 <script>
 
 function boom()
 {
   var a = document.documentElement;
   var b = document.createElementNS("http://www.w3.org/1999/xhtml", "body");
-  b.setAttributeNS(null, "style", "-moz-column-width: 20em;");
+  b.setAttributeNS(null, "style", "column-width: 20em;");
   a.innerHTML = "<frameset>";
   b.innerHTML = "<dd><marquee>x";
   document.removeChild(a);
   document.appendChild(b);
 }
 
 </script>
 </head>
--- a/layout/base/crashtests/589787.html
+++ b/layout/base/crashtests/589787.html
@@ -8,20 +8,20 @@ function boom() {
   document.documentElement.offsetHeight;
 }
 </script>
 <style id="e">
 body #a::after { content: "before text"; position: fixed; }
 </style>
 </head>
 
-<body onload="boom();" style="-moz-column-count: 2; width: 100px;">
+<body onload="boom();" style="column-count: 2; width: 100px;">
 <div>m</div>
-<div id="a" style="-moz-column-count: 2;">
+<div id="a" style="column-count: 2;">
 m
 <br style="float: left;">
 m
 <span style="float: left;">m</span>
 
-<div style="float: left; -moz-column-width: 9999999999px;"></div>
+<div style="float: left; column-width: 9999999999px;"></div>
 </div>
 </body>
 </html>
--- a/layout/base/crashtests/645193.html
+++ b/layout/base/crashtests/645193.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html style="direction: rtl; -moz-column-width: 1px;"><head><script>
+<html style="direction: rtl; column-width: 1px;"><head><script>
 
 function boom()
 {
   document.documentElement.offsetHeight;
   document.body.style.unicodeBidi = "bidi-override";
   document.documentElement.offsetHeight;
 }
 
--- a/layout/base/crashtests/650489.xhtml
+++ b/layout/base/crashtests/650489.xhtml
@@ -1,3 +1,3 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="direction: rtl;"><body style="-moz-column-width: 1px; word-wrap: break-word; white-space: pre-wrap;" onload="document.documentElement.offsetHeight; document.body.style.wordWrap='';">
+<html xmlns="http://www.w3.org/1999/xhtml" style="direction: rtl;"><body style="column-width: 1px; word-wrap: break-word; white-space: pre-wrap;" onload="document.documentElement.offsetHeight; document.body.style.wordWrap='';">
 
 xy</body></html>
--- a/layout/base/crashtests/663662-1.html
+++ b/layout/base/crashtests/663662-1.html
@@ -1,1 +1,1 @@
-<!DOCTYPE html><html><head></head><body onload="document.documentElement.offsetHeight; document.body.style.MozColumnWidth='40000px';" style="word-spacing: 200000px; font-size-adjust: 2000; direction: rtl; white-space: pre-wrap; width: 50000px; -moz-column-width: 1px; height: 5000px;"> &#x00A0;&#x000D;&#x0001;X&#x4372;Y </body></html>
+<!DOCTYPE html><html><head></head><body onload="document.documentElement.offsetHeight; document.body.style.MozColumnWidth='40000px';" style="word-spacing: 200000px; font-size-adjust: 2000; direction: rtl; white-space: pre-wrap; width: 50000px; column-width: 1px; height: 5000px;"> &#x00A0;&#x000D;&#x0001;X&#x4372;Y </body></html>
--- a/layout/base/crashtests/663662-2.html
+++ b/layout/base/crashtests/663662-2.html
@@ -1,1 +1,1 @@
-<!DOCTYPE html><html><head></head><body onload="document.documentElement.offsetHeight; document.body.style.MozColumnWidth='40000px';" style="word-spacing: 200000px; font-size-adjust: 2000; direction: rtl; white-space: pre-wrap; width: 50000px; -moz-column-width: 1px; height: 5000px;"> &#x00A0;&#x000A;&#x0001;X&#x4372;Y </body></html>
+<!DOCTYPE html><html><head></head><body onload="document.documentElement.offsetHeight; document.body.style.MozColumnWidth='40000px';" style="word-spacing: 200000px; font-size-adjust: 2000; direction: rtl; white-space: pre-wrap; width: 50000px; column-width: 1px; height: 5000px;"> &#x00A0;&#x000A;&#x0001;X&#x4372;Y </body></html>
--- a/layout/base/crashtests/665837.html
+++ b/layout/base/crashtests/665837.html
@@ -1,9 +1,9 @@
-<html style="direction: rtl; -moz-column-width: 0pt; white-space: pre-line;"><head><script>
+<html style="direction: rtl; column-width: 0pt; white-space: pre-line;"><head><script>
 
 function boom()
 {
   document.documentElement.offsetHeight;
   document.documentElement.style.fontSize = "200%";
   document.documentElement.offsetHeight;
 }
 
--- a/layout/base/crashtests/691118-1.html
+++ b/layout/base/crashtests/691118-1.html
@@ -8,17 +8,17 @@ function boom()
 {
   document.documentElement.offsetHeight;
   document.getElementById("x").style.counterIncrement = "a";
   document.documentElement.offsetHeight;
 }
 
 </script>
 
-<body onload="boom();" style="-moz-column-count: 3">
+<body onload="boom();" style="column-count: 3">
   <div style="position: relative;">
     <div style="position: absolute; height: 3pt;"></div>
     <div style="position: absolute;" id="x"></div>
     <div style="position: absolute; height: 8pt;"></div>
   </div>
 </body>
 
 </html>
--- a/layout/base/crashtests/695861.html
+++ b/layout/base/crashtests/695861.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <body onload="document.documentElement.offsetHeight; document.getElementById('s').style.textTransform='uppercase'; document.documentElement.offsetHeight; ">
 
-<div style="white-space: pre-wrap; -moz-column-count: 2;"><span id="s" style="unicode-bidi: isolate;">
+<div style="white-space: pre-wrap; column-count: 2;"><span id="s" style="unicode-bidi: isolate;">
  <div style="direction: rtl;"></div></span></div>
 
 </body>
 </html>
--- a/layout/base/crashtests/698335.html
+++ b/layout/base/crashtests/698335.html
@@ -1,2 +1,2 @@
-<!DOCTYPE html><html style="white-space: pre-wrap; direction: rtl; -moz-column-width: 1px;"><style style="display: none;">.fl:first-letter { }</style><body class="fl">&#xD288;&#x062A;
+<!DOCTYPE html><html style="white-space: pre-wrap; direction: rtl; column-width: 1px;"><style style="display: none;">.fl:first-letter { }</style><body class="fl">&#xD288;&#x062A;
 D</body></html>
--- a/layout/base/crashtests/701504.html
+++ b/layout/base/crashtests/701504.html
@@ -12,13 +12,13 @@ function boom()
 
   document.documentElement.offsetHeight;
 }
 
 </script>
 </head>
 <body onload="boom();">
 
-<div style="-moz-column-count: 2;"><span style="unicode-bidi: isolate;" id="x"><span style="direction: rtl;"></span> <span style="unicode-bidi: isolate; white-space: pre;">
+<div style="column-count: 2;"><span style="unicode-bidi: isolate;" id="x"><span style="direction: rtl;"></span> <span style="unicode-bidi: isolate; white-space: pre;">
 x</span></span></div>
 
 </body>
 </html>
--- a/layout/base/crashtests/709536-1.xhtml
+++ b/layout/base/crashtests/709536-1.xhtml
@@ -1,1 +1,1 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="border-spacing: 300px; -moz-column-width: 0px;">h<body style="-moz-column-count: 1;"><td></td><textarea style="float: left;"></textarea></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="border-spacing: 300px; column-width: 0px;">h<body style="column-count: 1;"><td></td><textarea style="float: left;"></textarea></body></html>
--- a/layout/base/crashtests/736389-1.xhtml
+++ b/layout/base/crashtests/736389-1.xhtml
@@ -20,17 +20,17 @@ function rm(n) { n.parentNode.removeChil
 window.addEventListener("load", function() {
   document.documentElement.offsetHeight;
   rm(document.getElementById('x'));
 }, false);
 
 </script>
 </head>
 
-<body style="-moz-column-count: 2000;">
+<body style="column-count: 2000;">
   <li>
     <ol class="t" style="position: relative;">
       <span id="x"></span>
       <ol class="t" style="list-style-position: inside;">
         <div style="position: absolute;">
           <li>
             <div style="position: absolute;">
               <li>
--- a/layout/base/crashtests/772306.html
+++ b/layout/base/crashtests/772306.html
@@ -2,17 +2,17 @@
 <html>
 <head>
 <script>
 
 function boom()
 {
     var allNodes = [];
     allNodes[5] = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
-    allNodes[5].style.setProperty("-moz-column-width", "200px", "");
+    allNodes[5].style.setProperty("column-width", "200px", "");
     allNodes[5].style.setProperty("height", "2em", "");
     allNodes[7] = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
     allNodes[7].style.setProperty("float", "left", "");
     allNodes[30] = document.createElementNS("http://www.w3.org/1998/Math/MathML", "munder");
     (allNodes[7] || allNodes[5] || document.body).appendChild(allNodes[30]);
     (allNodes[5] || document.body).appendChild(allNodes[7]);
     allNodes[17] = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
     allNodes[17].style.setProperty("display", "inline-block", "");
--- a/layout/base/crashtests/788360.html
+++ b/layout/base/crashtests/788360.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <body onload="document.documentElement.offsetHeight; document.getElementById('v').style.counterReset='chicken'; document.documentElement.offsetHeight;">
 
-<div style="backface-visibility: hidden; perspective: 12em; display: table;"><div style="-moz-column-count: 2; white-space: pre;" id="v">x<span style="float: right; display: inline-block; width: 24px; height: 24px; background: yellow;"></span></div></div>
+<div style="backface-visibility: hidden; perspective: 12em; display: table;"><div style="column-count: 2; white-space: pre;" id="v">x<span style="float: right; display: inline-block; width: 24px; height: 24px; background: yellow;"></span></div></div>
 
 </body>
--- a/layout/base/tests/test_getBoxQuads_convertPointRectQuad.html
+++ b/layout/base/tests/test_getBoxQuads_convertPointRectQuad.html
@@ -249,17 +249,17 @@ That ensures the first quad's X position
   <tbody style="padding:0; margin:0; border:0; background:blue">
     <tr style="height:50px; padding:0; margin:0; border:0">
       <td style="border:0; margin:0; padding:0">Cell</td>
     </tr>
   </tbody>
   <caption style="height:40px; background:yellow">Caption</caption>
 </table>
 
-<div style="height:80px; -moz-column-count:2; -moz-column-fill:auto; border:2px solid black;">
+<div style="height:80px; column-count:2; column-fill:auto; border:2px solid black;">
   <div style="height:20px;"></div>
   <div id="colSplit" style="height:80px; background:blue; border:10px solid red; border-bottom-width:15px"></div>
 </div>
 
 <div style="width:200px; border:2px solid black;"
   ><em style="width:150px;"></em
   ><span id="inlineSplit" style="background:pink; border:10px solid red; border-right-width:15px"
     ><em style="width:20px; background:green"></em><em style="width:60px"></em
--- a/layout/forms/crashtests/407066.html
+++ b/layout/forms/crashtests/407066.html
@@ -1,1 +1,1 @@
-<div style="display: inline-block; -moz-column-count: 2;">text<input type="reset" style="float: right;">
+<div style="display: inline-block; column-count: 2;">text<input type="reset" style="float: right;">
--- a/layout/forms/crashtests/451316.html
+++ b/layout/forms/crashtests/451316.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<div style="-moz-column-width: 1px;"><select style="height: 12em; display: block;"></select></div>
-<div style="-moz-column-width: 1px;"><select multiple style="height: 12em; display: block;"></select></div>
+<div style="column-width: 1px;"><select style="height: 12em; display: block;"></select></div>
+<div style="column-width: 1px;"><select multiple style="height: 12em; display: block;"></select></div>
 </body>
 </html>
--- a/layout/forms/crashtests/513113-1.html
+++ b/layout/forms/crashtests/513113-1.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html><body onload="document.body.style.display = 'table';" style="-moz-column-count: 1; white-space: pre-line; -moz-appearance: resizer; height: 23698324514pc;">
+<html><body onload="document.body.style.display = 'table';" style="column-count: 1; white-space: pre-line; -moz-appearance: resizer; height: 23698324514pc;">
 
 
 
 <input></body></html>
--- a/layout/forms/crashtests/865602.html
+++ b/layout/forms/crashtests/865602.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html><body>
 
-<div style="-moz-column-count: 2;"><fieldset style="transform-style: preserve-3d;"><fieldset style="white-space: pre-line; position: fixed;"><div style="position: fixed;">
+<div style="column-count: 2;"><fieldset style="transform-style: preserve-3d;"><fieldset style="white-space: pre-line; position: fixed;"><div style="position: fixed;">
 
 
 </div></fieldset></fieldset></div>
 
 </body></html>
--- a/layout/generic/crashtests/1015844.html
+++ b/layout/generic/crashtests/1015844.html
@@ -1,12 +1,12 @@
 <style>
 .multicol {
   width: 500px;
-  -moz-column-width: 100px;
+  column-width: 100px;
   height: 100px;
   position: relative;
 }
 #clear {
   position: absolute;
 }
 .float {
   height: 300px;
--- a/layout/generic/crashtests/1037903.html
+++ b/layout/generic/crashtests/1037903.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html style="-moz-column-width: calc(15px);">
+<html style="column-width: calc(15px);">
 <body>
 <video></video><audio style="box-decoration-break: clone; display: block; direction: rtl;"></audio>
 </body>
 </html>
--- a/layout/generic/crashtests/1042489.html
+++ b/layout/generic/crashtests/1042489.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html style="-moz-column-width: 1px;">
-<body style="-moz-column-width: 1px; box-decoration-break: clone;">
+<html style="column-width: 1px;">
+<body style="column-width: 1px; box-decoration-break: clone;">
 <div>A B</div>
 </body>
 </html>
--- a/layout/generic/crashtests/1153695.html
+++ b/layout/generic/crashtests/1153695.html
@@ -8,17 +8,17 @@
             {
                 document.documentElement.offsetHeight;
                 document.body.appendChild(document.getElementById("x"));
                 document.documentElement.offsetHeight;
             }
         </script>
     </head>
 
-    <body style="-moz-column-count: 4;" onload="boom();">
+    <body style="column-count: 4;" onload="boom();">
         <div style="float: left; height: 10px; width: 10px;">
             <div id="x">
                 <div style="height: 80px;"></div>
                 <div style="float: left; height: 10px;"></div>
             </div>
         </div>
     </body>
 
--- a/layout/generic/crashtests/1225005.html
+++ b/layout/generic/crashtests/1225005.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <html>
-<body style="padding: 810520769306363pt; -moz-column-count: 10; transform: translate(50%);"><div style="position: absolute;"></div></body>
+<body style="padding: 810520769306363pt; column-count: 10; transform: translate(50%);"><div style="position: absolute;"></div></body>
 </html>
--- a/layout/generic/crashtests/1229437-1.html
+++ b/layout/generic/crashtests/1229437-1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset="UTF-8">
 <style>
   rbc { display: ruby-base-container; }
 </style>
-<div style="-moz-column-width: 1px">
+<div style="column-width: 1px">
   <ruby><rbc></rbc><rb><div style="float: right"></div></rb></ruby>X
 </div>
--- a/layout/generic/crashtests/1229437-2.html
+++ b/layout/generic/crashtests/1229437-2.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <meta charset="UTF-8">
-<div style="-moz-column-width: 1px">
+<div style="column-width: 1px">
   <ruby><rb></rb><rb><div style="float: right"></div></rb></ruby>X
 </div>
--- a/layout/generic/crashtests/1278461-1.html
+++ b/layout/generic/crashtests/1278461-1.html
@@ -7,17 +7,17 @@ function boom()
 {
     x.style.display = "contents";
 }
 
 </script>
 </head>
 <body onload="boom();">
 
-    <div style="-moz-column-width: 1px;">
+    <div style="column-width: 1px;">
         <div style="display: grid;">
             <div style="height: 200px;">v</div>
             <div style="height: 200px;" id="x">x</div>
         </div>
     </div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/1278461-2.html
+++ b/layout/generic/crashtests/1278461-2.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html class="reftest-wait"><head>
 <meta http-equiv="content-type" content="text/html; charset=windows-1252"></head><body>
 <style>
-html{-moz-columns:50px auto}
+html{columns:50px auto}
 body{display:grid}
 div{height:200px}
 </style>
 <script>
 window.onload=function(){
 var b = document.body, v;
 b.appendChild(document.createElementNS('http://www.w3.org/1999/xhtml', 'div'));
 b.appendChild(document.createElementNS('http://www.w3.org/1999/xhtml', 'div'));
--- a/layout/generic/crashtests/337412-1.html
+++ b/layout/generic/crashtests/337412-1.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 
 <style>
 
 .columns {
-	-moz-column-width: 20em;
-	-moz-column-gap: 3em;
+	column-width: 20em;
+	column-gap: 3em;
 }
 
 
 </style>
 
 </head>
 
 <body>
--- a/layout/generic/crashtests/344557-1.html
+++ b/layout/generic/crashtests/344557-1.html
@@ -14,19 +14,19 @@ setTimeout(removestyles,200);
 sub::after, div::after { content:"anonymous text"; border:3px solid black;text-transform: uppercase;}
 sub::before, div::before { content:"before text"; font-size: 10px;}
 </style>
 </head>
 <body>
 
 <ul>
   <sub>t</sub>
-  <div style="-moz-column-count: 3;">
+  <div style="column-count: 3;">
     <sub>t-column-councode&gt;text</sub>
-    <div style="-moz-column-count: 3;"><sub>text styletttmoztcolumntcountt 2;ttext</sub>
+    <div style="column-count: 3;"><sub>text styletttmoztcolumntcountt 2;ttext</sub>
       <div>
         <sub>text</sub>
       </div>
     </div>
   </div>
 </ul>
 
 </body></html>
--- a/layout/generic/crashtests/348887-1-inner.html
+++ b/layout/generic/crashtests/348887-1-inner.html
@@ -1,21 +1,21 @@
 <html><head>
 <style>
 blockquote::first-letter {float: right;}
 </style>
 <title>
-Testcase bug - Crash [@ nsFrameList::DestroyFrames] on reload with -moz-column-count, -moz-inline-block and blockquote::first-letter
+Testcase bug - Crash [@ nsFrameList::DestroyFrames] on reload with column-count, -moz-inline-block and blockquote::first-letter
 </title>
 </head>
 <body>
 This page should not crash on reload
-<div style=" -moz-column-count: 2;">
+<div style=" column-count: 2;">
 <span style="display: table;"></span>
 <blockquote style="display: -moz-inline-block;">anonymous text</blockquote>
 </div>
 
 <script>
 document.location.reload();
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/350370.html
+++ b/layout/generic/crashtests/350370.html
@@ -7,17 +7,17 @@ nobr::first-line { font-size:110%;}
 #b td::after { content:"anonymous text"; }
 nobr::after{ content:"anonymous text"; }
 
 #b::before { content:"before text";}
 #b td::before { content:"before text";}
 </style>
 </head>
 <body>
-<table style="display: table-row;"></table><nobr style="display: list-item; -moz-column-count: 2;">
+<table style="display: table-row;"></table><nobr style="display: list-item; column-count: 2;">
 <table id="b" style="display: inline;"></table>
 </nobr>
 <br>
 This page should not crash Mozilla
 <script>
 function doe(){
    var td = document.createElement('td');;
    td.setAttribute('height', '50%');
@@ -34,9 +34,9 @@ function doe(){
 
    var td = document.createElement('td');;
    td.setAttribute('height', '50%');
    document.getElementsByTagName('tr')[0].appendChild(td); 
 } 
 setTimeout(doe, 60);
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/354458-1.html
+++ b/layout/generic/crashtests/354458-1.html
@@ -1,10 +1,10 @@
 <html>
 
 <body>
-  <div style="height: 5px; -moz-column-count: 3;">
+  <div style="height: 5px; column-count: 3;">
     Text!
     <span style="float: left">Float!</span>
   </div>
 </body>
 
 </html>
--- a/layout/generic/crashtests/354458-2.html
+++ b/layout/generic/crashtests/354458-2.html
@@ -8,17 +8,17 @@
 	<style type="text/css">
 
 	p { margin: 0; }
 
 	</style>
 </head>
 <body>
 
-<div style="-moz-column-width: 10em; height: 2.5em">
+<div style="column-width: 10em; height: 2.5em">
   text
   <img src="../../../testing/crashtest/images/tree.gif" width="197" height="200" style="float:left">
   <p>text</p>
   <p>text</p>
   <p>text</p>
   <p>text</p>
 </div>
 
--- a/layout/generic/crashtests/355426-1.html
+++ b/layout/generic/crashtests/355426-1.html
@@ -9,19 +9,19 @@ function foo()
 }
 </script>
 
 </head>
 
 
 <body onload="foo()">
 
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
   <ol id="ol1" style="height: 30px;">
     <li>A</li>
     <li><p id="p3" style="width: 1em;">Foo Foo Foo Foo Foo Foo Foo Foo Foo Foo Foo</p></li>
   </ol>
 </div>
 
 <p id="navish">E</p>		
 
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/359371-1.html
+++ b/layout/generic/crashtests/359371-1.html
@@ -7,17 +7,17 @@ body {
   width: 500px;
 }
 
 p {
 	font-family: monospace;
 	font-size: 12px;
 }
 .columns {
-	-moz-column-count: 3;
+	column-count: 3;
 }
 
 .toppadded
 {
 	padding-top: 20px;
 }
 
 .floatbox {
--- a/layout/generic/crashtests/359371-2.html
+++ b/layout/generic/crashtests/359371-2.html
@@ -7,17 +7,17 @@ body {
   width: 500px;
 }
 
 p {
 	font-family: monospace;
 	font-size: 12px;
 }
 .columns {
-	-moz-column-count: 3;
+	column-count: 3;
 }
 
 .toppadded
 {
 	padding-top: 18px;
 }
 
 .floatbox {
--- a/layout/generic/crashtests/364220.html
+++ b/layout/generic/crashtests/364220.html
@@ -2,16 +2,16 @@
 <title>Testcase bug 364220 - [reflow branch][columns] Crash [@ nsLineLayout::ReflowFrame] using moz-column-count, floats, generated content and first-line</title>
 <style>
 body > span::first-line { }
 span::before { content:"before text"; border:3px solid black;}
 </style>
 </head>
 <body>
 
-<span style=" float: left; -moz-column-count: 2;">
+<span style=" float: left; column-count: 2;">
   <span style="float: right;">
-    <span style=" float: right;-moz-column-count: 2;"></span>
+    <span style=" float: right;column-count: 2;"></span>
   </span>
 </span>
 
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/367360.html
+++ b/layout/generic/crashtests/367360.html
@@ -1,30 +1,30 @@
 <html><head>
-<title>Testcase bug - Crash [@ nsHTMLButtonControlFrame::GetContentInsertionFrame] with -moz-column-count and display: list-item</title>
+<title>Testcase bug - Crash [@ nsHTMLButtonControlFrame::GetContentInsertionFrame] with column-count and display: list-item</title>
 </head>
 <body>
 <div style="display: table;">
 text
-<listing style="-moz-column-count: 2;">
+<listing style="column-count: 2;">
 <dl>
 
 
 
 
 
 
 
 
 tesxt
 
 
 <menu>
-<span style="display: list-item;  -moz-column-count: 1;">
-<span style="display: list-item;  -moz-column-count: 1;">
+<span style="display: list-item;  column-count: 1;">
+<span style="display: list-item;  column-count: 1;">
 text
 </span></span>
 </menu>
 <div>text</div>
 </dl>
 </listing>
 </div>
 </body></html>
--- a/layout/generic/crashtests/368568.html
+++ b/layout/generic/crashtests/368568.html
@@ -2,13 +2,13 @@
 <style>
 *::first-line { }
 *::after { content:"anonymous text"; }
 *::before { content:"before text"; }
 </style>
 </head>
 <body>
 
-<ol style="overflow: hidden;  float: right; -moz-column-count: 3;">
+<ol style="overflow: hidden;  float: right; column-count: 3;">
 <span style="overflow: auto;  float: left;"></span>
 </ol>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/368863-1.html
+++ b/layout/generic/crashtests/368863-1.html
@@ -1,5 +1,5 @@
 <style>
 *::first-line { }
 *::before { content:"before text";}
 </style>
-<object style="position: fixed;-moz-column-count: 100;"><ol style="float: right;">
\ No newline at end of file
+<object style="position: fixed;column-count: 100;"><ol style="float: right;">
--- a/layout/generic/crashtests/376419.html
+++ b/layout/generic/crashtests/376419.html
@@ -1,28 +1,28 @@
 <html><head>
 <style>
 *::first-line { }
 *::after { content:"anonymous text"; border:3px solid black;}
 *::before { content:"before text"; border:3px solid black;font-size: 10px;}
 </style>
 </head>
 <body>
-<div style="-moz-column-count: 2; width: 1400px;">
+<div style="column-count: 2; width: 1400px;">
   &#1593; tesxt
   <span>
     &#1593; tesxt &#1593; tesxt &#1593; tesxt 
     <span>
       &#1593; tesxt &#1593; tesxt &#1593; tesxt &#1593; tesxt 
     </span>
  </span>
-<div style="-moz-column-count: 2;">
-<div style="-moz-column-count: 2; white-space: nowrap;">
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
+<div style="column-count: 2; white-space: nowrap;">
+<div style="column-count: 2;">
 <span>
 &#1593; tesxt &#1593; tesxt &#1593; tesxt 
 </span>
 </div>
 </div>
 </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/382262-1.html
+++ b/layout/generic/crashtests/382262-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
 
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
 a<span style="float: right">e<select></select></span> r
 </div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/386827-1.html
+++ b/layout/generic/crashtests/386827-1.html
@@ -5,12 +5,12 @@
 function boom()
 {
   document.getElementById("d1").appendChild(document.createElement("span"));
   document.getElementById("d2").style.direction = "rtl";
 }
 </script>
 </head>
 <body onload="boom()">
-<div id="d1" style="-moz-column-width: 1em;">a b c d</div>
+<div id="d1" style="column-width: 1em;">a b c d</div>
 <div id="d2"></div>
 </body>
 </html>
--- a/layout/generic/crashtests/390050-1.html
+++ b/layout/generic/crashtests/390050-1.html
@@ -7,18 +7,18 @@ body {
   font-size: 62.5%; /* Resets 1em to 10px */
 }
 
 #content { font-size: 1.2em; }
 
 .entry p { font-size: 1.05em; }
 
 .entry {
- -moz-column-width: 25em;
- -moz-column-gap: 3em;
+ column-width: 25em;
+ column-gap: 3em;
 }
 
 .entry img {
   float: left;
   margin: 3px 10px;
 }
 
 .alt {
--- a/layout/generic/crashtests/390050-2.html
+++ b/layout/generic/crashtests/390050-2.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
 <style type="text/css">
 .entry {
- -moz-column-width: 25em;
- -moz-column-gap: 3em;
+ column-width: 25em;
+ column-gap: 3em;
 }
 </style>
 
 </script>
 
 </head>
 <body><div class="entry">
 <p>Edit: Wow, quick response there!  Thanks for the pointers guys, looks like the dbginfo
--- a/layout/generic/crashtests/390050-3.html
+++ b/layout/generic/crashtests/390050-3.html
@@ -1,4 +1,4 @@
-<div class="entry" style="margin-right: 260px; padding: 0 17px; -moz-column-width: 25em; -moz-column-gap: 3em">
+<div class="entry" style="margin-right: 260px; padding: 0 17px; column-width: 25em; column-gap: 3em">
 <img width="222" style="float: left; margin: 3px 10px;">
 <p style="padding: 10px; font-size: 1.05em;">ABCDEF GHI JKLMNOPQR</p>
 </div>
--- a/layout/generic/crashtests/390762-1.html
+++ b/layout/generic/crashtests/390762-1.html
@@ -19,12 +19,12 @@ function boom()
 
 <style>
 #t { border: 1px solid green; }
 </style>
 
 </head>
 
 <body onload="boom();">
-<div style="-moz-column-count: 2;"><div id="t" class="float"></div></div>
+<div style="column-count: 2;"><div id="t" class="float"></div></div>
 </body>
 
 </html>
--- a/layout/generic/crashtests/391894-1.html
+++ b/layout/generic/crashtests/391894-1.html
@@ -4,14 +4,14 @@
 
 <style>
 
 #q:first-line { }
 
 </style>
 
 </head>
-<body style="-moz-column-width: 0em">
+<body style="column-width: 0em">
 
 <div id="q">a b c<span style="float: right;"></span></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/393956-1.html
+++ b/layout/generic/crashtests/393956-1.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <style>
 body {
-  -moz-column-count: 2;
+  column-count: 2;
 }
 #x {
   height: 20px;
 }
 #y {
   height: 80px;
 }
 </style>
--- a/layout/generic/crashtests/393956-2.html
+++ b/layout/generic/crashtests/393956-2.html
@@ -1,14 +1,14 @@
 <html>
 <head>
 <style>
 body {
   height: 40px;
-  -moz-column-count: 2;
+  column-count: 2;
 }
 #x {
   height: 20px;
 }
 #y {
   height: 80px;
 }
 </style>
--- a/layout/generic/crashtests/393956-3.html
+++ b/layout/generic/crashtests/393956-3.html
@@ -1,11 +1,11 @@
 <html>
 <head><style>
-body { -moz-column-count: 1; }
+body { column-count: 1; }
 #x   { height: 1px; }
 #y   { height: 2px; }
 
 </style></head>
 
 <body><div id="x"><div id="y"></div></div></body>
 
 </html>
--- a/layout/generic/crashtests/393956-4.html
+++ b/layout/generic/crashtests/393956-4.html
@@ -1,11 +1,11 @@
 <html>
 <head><style>
-body { -moz-column-count: 2; }
+body { column-count: 2; }
 #x   { height: 1px; }
 #y   { height: 2px; }
 
 </style></head>
 
 <body><div id="x"><div id="y"></div></div></body>
 
 </html>
--- a/layout/generic/crashtests/394237-1.html
+++ b/layout/generic/crashtests/394237-1.html
@@ -1,15 +1,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style>
 
 body {
   height: 50px;
-  -moz-column-count: 2;
+  column-count: 2;
 }
 .container {
   height: 10px;
 }
 .overflow {
   height: 100px;
 }
 .bb {
--- a/layout/generic/crashtests/395316-1.html
+++ b/layout/generic/crashtests/395316-1.html
@@ -3,11 +3,11 @@
 <script>
 function boom()
 {
   document.getElementById("float").style.cssFloat = "";
 }
 </script>
 </head>
 <body onload="boom();">
-<div style="-moz-column-count: 2; width: 3ch;"><span><span id="float" style="float: right;">za za za za za za za za</span></span></div>
+<div style="column-count: 2; width: 3ch;"><span><span id="float" style="float: right;">za za za za za za za za</span></span></div>
 </body>
 </html>
--- a/layout/generic/crashtests/397007-1.html
+++ b/layout/generic/crashtests/397007-1.html
@@ -22,16 +22,16 @@ function boom()
   content: "b";
 }
 
 </style>
 
 </head>
 
 <body onload="boom();">
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
   X
   <div class="margin">y</div>
   <span><span id="g"></span>&shy;<div class="margin"></div><span class="dd"><div></div></span></span>
 </div>
 </body>
 
 </html>
--- a/layout/generic/crashtests/398322-2.html
+++ b/layout/generic/crashtests/398322-2.html
@@ -1,12 +1,12 @@
 <html class="reftest-print">
 <head>
 <style>
 q::after { content:"anonymous text"; text-transform: uppercase;}
 </style>
 </head>
 <body>
-<div style="position: absolute; width: 50px; -moz-column-count: 2;">
+<div style="position: absolute; width: 50px; column-count: 2;">
   <div style="position: absolute;"> <q> </q> </div>
 </div>
 </body>
 </html>
--- a/layout/generic/crashtests/398332-2.html
+++ b/layout/generic/crashtests/398332-2.html
@@ -10,18 +10,18 @@ document.getElementsByTagName('*')[7].re
 }
 
 setTimeout(removestyles,300);
 </script>
 
 </head>
 <body>
 <div style="position: relative; width: 500px;">
-  <span style="position: absolute; -moz-column-count: 2;">
+  <span style="position: absolute; column-count: 2;">
     <span style=" position: absolute;">
       <span style=" display: inline-block; ">m</span>
       <input>
       <input style="position: fixed;">m
     </span>
   </span>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/399407-1.xhtml
+++ b/layout/generic/crashtests/399407-1.xhtml
@@ -4,17 +4,17 @@
     .container {
       height: 20px;
     }
     .overflow {
       height: 30px;
     }
     body {
       width: 300px;
-      -moz-column-width: 100px;
+      column-width: 100px;
     }
   </style>
   
 <body>
   <div class="container">
     <div class="overflow"></div>
   </div>
   <div class="container">
--- a/layout/generic/crashtests/399412-1.html
+++ b/layout/generic/crashtests/399412-1.html
@@ -10,19 +10,19 @@
 <style>
 .overflow {
   height: 150px;
   border: 1px silver solid;
 }
 body {
   height: 60px;
   width: 300px;
-  -moz-column-width: 50px;
-  -moz-column-gap: 1px;
-  -moz-column-fill: auto;
+  column-width: 50px;
+  column-gap: 1px;
+  column-fill: auto;
 }
 </style>
 
 </head>
 
 <body onload="s=document.getElementById('s'); s.parentNode.removeChild(s);">
 
 <div class="container"><div class="overflow"></div></div>
--- a/layout/generic/crashtests/399843-1.html
+++ b/layout/generic/crashtests/399843-1.html
@@ -1,16 +1,16 @@
 <html class="reftest-wait">
 <head>
 <style>
 
     #colset {
       width: 300pt;
       height: 2in;
-      -moz-column-count: 3;
+      column-count: 3;
     }
     
     .container {
       height: 1in;
     }
 
     .b6 {
       height: 10in;
--- a/layout/generic/crashtests/400078-1.html
+++ b/layout/generic/crashtests/400078-1.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style>
 
 html, body, table, tbody, tr, td, #colset, #e, #s { height: 100%; }
 
-#colset { -moz-column-count: 2; -moz-column-width: 200px; border: 2px solid black; text-indent: 500px; }
+#colset { column-count: 2; column-width: 200px; border: 2px solid black; text-indent: 500px; }
 
 #s { display: inline-block; width: 30px; border: 1px solid red; }
 
 </style>
 </head>
 
 <body>
 
--- a/layout/generic/crashtests/400190.html
+++ b/layout/generic/crashtests/400190.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style>
 
 body {
   position: fixed;
   font-family: monospace;
-  -moz-column-width: 10px;
+  column-width: 10px;
   border: 2px solid #aaa;
 }
 
 #padded {
   padding-top: 40px;
   padding-bottom: 40px;
 }
 
--- a/layout/generic/crashtests/400223-1.html
+++ b/layout/generic/crashtests/400223-1.html
@@ -1,15 +1,15 @@
 <html>
 <head>
 <style type="text/css">
 
     #colset {
       height: 2in;
-      -moz-column-count: 3;
+      column-count: 3;
     }
     #container {
       position: relative;
     }
     #overflow {
       position: absolute;
       height: 5in;
     }
--- a/layout/generic/crashtests/400232-1.html
+++ b/layout/generic/crashtests/400232-1.html
@@ -1,11 +1,11 @@
 <html>
 <head>
 </head>
 
 <body>
 
-<div style="-moz-column-count: 2; overflow: auto; height: 10px;"><br><div style="float: right; height: 15px;"></div></div>
+<div style="column-count: 2; overflow: auto; height: 10px;"><br><div style="float: right; height: 15px;"></div></div>
 
 </body>
 
 </html>
--- a/layout/generic/crashtests/400244-1.html
+++ b/layout/generic/crashtests/400244-1.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html> 
 <html>
 <head>
 <style>
 
   #colset { 
-    -moz-column-count: 2; 
-    -moz-column-gap: 0; 
+    column-count: 2; 
+    column-gap: 0; 
     border: 2px solid black; 
     height: 12em; 
   }
 
   #b { 
     margin: 10em 0pt; 
   }
 
--- a/layout/generic/crashtests/404140-1.html
+++ b/layout/generic/crashtests/404140-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-</head><body onload="document.body.style.height = '2px';" style="float: right; height: 2px; -moz-column-width: 0pt;">
+</head><body onload="document.body.style.height = '2px';" style="float: right; height: 2px; column-width: 0pt;">
 <div style="overflow: -moz-hidden-unscrollable;">a b</div>
-</body></html>
\ No newline at end of file
+</body></html>
--- a/layout/generic/crashtests/404146-1.html
+++ b/layout/generic/crashtests/404146-1.html
@@ -1,15 +1,15 @@
 <html>
 <head>
 <style>
 
 .colset { 
-  -moz-column-count: 2; 
-  -moz-column-width: 50px; 
+  column-count: 2; 
+  column-width: 50px; 
   float: left; 
   border: 2px solid black; 
   height: 10em; 
   font: 12px monospace;
 }
 
 #t {
   display: inline-block;
--- a/layout/generic/crashtests/404215-1.html
+++ b/layout/generic/crashtests/404215-1.html
@@ -1,14 +1,14 @@
 <html>
 <head>
 <style>
 
 #colset {
-  -moz-column-count: 3;
+  column-count: 3;
 }
 .a {
   height: 3in;
 }
 .b {
   height: 24pt;
 }
 .c {
--- a/layout/generic/crashtests/404215-2.html
+++ b/layout/generic/crashtests/404215-2.html
@@ -5,17 +5,17 @@
     100px/30px/74+px
    Get only an assert unless you set ".d { position: absolute; }".
    
    Trigger hang (separate issue, absolute not needed):
     10px/10px/9999px
     10px/10px/999999px --> "bad height" notreached
 */
 #colset { width: 200px;
-          -moz-column-count: 3; }
+          column-count: 3; }
 #a      { height: 100px;        }
 #b      { height:  50px;        }
 #c      { height:  51px;        }
 #d      { position: absolute;   }
 </style>
 <script>
   function boom() {
     document.getElementById('a').style.height = 'auto';
--- a/layout/generic/crashtests/404215-3.html
+++ b/layout/generic/crashtests/404215-3.html
@@ -5,17 +5,17 @@
     100px/30px/74+px
    Get only an assert unless you set ".d { position: absolute; }".
    
    Trigger hang (separate issue, absolute not needed):
     10px/10px/9999px
     10px/10px/999999px --> "bad height" notreached
 */
 #colset { width: 200px;
-          -moz-column-count: 3; }
+          column-count: 3; }
 #a      { height: 10px;         }
 #b      { height: 10px;         }
 #c      { height: 999999px;     }
 
 </style>
 </head>
 <!-- Removing whitespace in body for simpler frame trees -->
 <body
--- a/layout/generic/crashtests/404219-1.html
+++ b/layout/generic/crashtests/404219-1.html
@@ -2,18 +2,18 @@
 <head>
 <style>
   body {
     /* Standize line-height, because the default varies by platform */
     line-height: 50px;
   }
   div#a {
     width: 3em;
-    -moz-column-count: 2;
-    -moz-column-gap: 0px;
+    column-count: 2;
+    column-gap: 0px;
     background: lightgreen;
   }
   div#b {
     float: left;
     background: lightblue;
   }
   div#c {
     height: 100px;
--- a/layout/generic/crashtests/404219-2.html
+++ b/layout/generic/crashtests/404219-2.html
@@ -2,18 +2,18 @@
 <head>
 <style>
   body {
     /* Standize line-height, because the default varies by platform */
     line-height: 50px;
   }
   div#a {
     width: 3em;
-    -moz-column-count: 2;
-    -moz-column-gap: 0px;
+    column-count: 2;
+    column-gap: 0px;
     background: lightgreen;
   }
   div#b {
     height: 100px;
     float: left;
     background: lightblue;
   }
   div#c {
--- a/layout/generic/crashtests/406380.html
+++ b/layout/generic/crashtests/406380.html
@@ -1,12 +1,12 @@
 <html style="direction: rtl;">
 <body onload="document.getElementById('i').style.fontSize = '10em';">
 
-<div style="-moz-column-width: 60px;">
+<div style="column-width: 60px;">
 a
 <div style="overflow: -moz-hidden-unscrollable; white-space: pre;" id="i">
 b
 </div>
 </div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/406902-1.html
+++ b/layout/generic/crashtests/406902-1.html
@@ -3,18 +3,18 @@
 <head>
 
 <style type="text/css">
 
     .container {
       position: relative;
     }
     #colset {
-      -moz-column-count: 3;
-      -moz-column-gap: 0;
+      column-count: 3;
+      column-gap: 0;
       border: silver 2pt;
       border-style: none solid;
     }
     .b1 {
       position: absolute;
       height: 336pt;
       margin-left: 20pt;
     }
--- a/layout/generic/crashtests/408602-1.html
+++ b/layout/generic/crashtests/408602-1.html
@@ -1,12 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 </head>
 
 <body style="position: fixed;">
 
-<div style="position: absolute; -moz-column-width: 20em;"><div style="white-space: pre; float: right; height: 50px;"><div style="width: 100px; height: 12em;"></div>
+<div style="position: absolute; column-width: 20em;"><div style="white-space: pre; float: right; height: 50px;"><div style="width: 100px; height: 12em;"></div>
 </div></div>
 
 </body>
 
 </html>
--- a/layout/generic/crashtests/408737-1.html
+++ b/layout/generic/crashtests/408737-1.html
@@ -1,11 +1,11 @@
 <html>
 <head><style>
-#colset { -moz-column-count: 1; }
+#colset { column-count: 1; }
 #short  { height: 0px;          }
 #tall   { height: 10000px;      }
 </style></head>
 <body>
  <div id="colset">
   <div id="short">
    <div id="tall"></div>
   </div>
--- a/layout/generic/crashtests/408737-2.html
+++ b/layout/generic/crashtests/408737-2.html
@@ -1,11 +1,11 @@
 <html>
 <head><style>
-#colset { -moz-column-count: 1; }
+#colset { column-count: 1; }
 #short  { height: 10px;         }
 #tall   { height: 100000px;     }
 </style></head>
 <body>
  <div id="colset">
   <div id="short">
    <div id="tall"></div>
   </div>
--- a/layout/generic/crashtests/408749-1.xhtml
+++ b/layout/generic/crashtests/408749-1.xhtml
@@ -1,1 +1,1 @@
-<html xmlns="http://www.w3.org/1999/xhtml"><body style="-moz-column-count: 2;"><caption><div>foo<td></td></div></caption></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><body style="column-count: 2;"><caption><div>foo<td></td></div></caption></body></html>
--- a/layout/generic/crashtests/408883-1.html
+++ b/layout/generic/crashtests/408883-1.html
@@ -1,16 +1,16 @@
 <html>
 <head>
 
 <style type="text/css">
 
 body {
-  -moz-column-count: 2;
-  -moz-column-width: 100px;
+  column-count: 2;
+  column-width: 100px;
   height: 200px;
   width: 400px;
 }
 .b {
   height: 300px;
 }
 .f {
   float: left;
--- a/layout/generic/crashtests/411213-1.html
+++ b/layout/generic/crashtests/411213-1.html
@@ -1,9 +1,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml" style="direction: rtl;">
 <body onload="document.getElementById('i').style.fontSize = '10em';">
 
-<div style="-moz-column-width: 60px;"><div id="i" style="overflow: -moz-hidden-unscrollable; white-space: pre;">
+<div style="column-width: 60px;"><div id="i" style="overflow: -moz-hidden-unscrollable; white-space: pre;">
  b
 </div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/411213-2.xml
+++ b/layout/generic/crashtests/411213-2.xml
@@ -1,8 +1,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" style="direction: rtl;">
 <body onload="document.getElementById('i').style.fontSize = '10em';">
 
-<div style="-moz-column-width: 60px;"><div id="i" style="overflow: -moz-hidden-unscrollable; white-space: pre;">
+<div style="column-width: 60px;"><div id="i" style="overflow: -moz-hidden-unscrollable; white-space: pre;">
  b</div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/411835.html
+++ b/layout/generic/crashtests/411835.html
@@ -5,15 +5,15 @@
 
 div { position: absolute; height: 10px; width: 10px; }
 
 </style>
 </head>
 
 <body onload="document.getElementById('c').style.counterIncrement = 'z';">
 
-<div style="-moz-column-count: 2;"><div id="c" style="white-space: pre;">
+<div style="column-count: 2;"><div id="c" style="white-space: pre;">
 
 <div>
 <div></div></div></div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/412014-1.html
+++ b/layout/generic/crashtests/412014-1.html
@@ -1,12 +1,12 @@
-<html style="white-space: pre; -moz-column-count: 2;">
+<html style="white-space: pre; column-count: 2;">
 <head></head>
 
-<body onload="document.body.style.MozFloatEdge = 'margin-box'" style="-moz-column-width: 20em;">
+<body onload="document.body.style.MozFloatEdge = 'margin-box'" style="column-width: 20em;">
 
 <div style="position: relative; height: 80px; margin: 10px;">
 
 
 
 
 <div style="position: absolute; height: 11px; top: 19px;"></div>
 </div>
--- a/layout/generic/crashtests/412543-1.html
+++ b/layout/generic/crashtests/412543-1.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 
-.c { -moz-column-width: 1px; width: 93px; }
+.c { column-width: 1px; width: 93px; }
 .c:first-letter { }
 
 </style>
 </head>
 
 <body>
 
 <div class="c"><small>a b . d e f h i , k ; m n o p q</small></div>
--- a/layout/generic/crashtests/413048-1.html
+++ b/layout/generic/crashtests/413048-1.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <body>
 
-<div style="-moz-column-count: 15; width: 16px; height: 16px;"><span><div style="display: inline-block;">a</div><div style="float: left;"></div>
+<div style="column-count: 15; width: 16px; height: 16px;"><span><div style="display: inline-block;">a</div><div style="float: left;"></div>
 </span></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/413079-1.xhtml
+++ b/layout/generic/crashtests/413079-1.xhtml
@@ -1,10 +1,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 </head>
 <body onload='document.getElementById("x").style.letterSpacing = "20px";'>
 
-<div style="-moz-column-count: 15;" id="x"><span>AAA
+<div style="column-count: 15;" id="x"><span>AAA
 <div style="float: left;">BBBB<div>CCCC</div></div></span></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/413079-2.xhtml
+++ b/layout/generic/crashtests/413079-2.xhtml
@@ -1,12 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
  </head>
  <body >
-  <div style="-moz-column-count: 12; border: 1px solid green">
+  <div style="column-count: 12; border: 1px solid green">
    <span>AAAA
     <div style="float: left;border: 1px solid blue">BBBB
     </div>
    </span>
   </div>
  </body>
 </html>
--- a/layout/generic/crashtests/413079-3.xhtml
+++ b/layout/generic/crashtests/413079-3.xhtml
@@ -1,12 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
  </head>
  <body >
-  <div style="-moz-column-count: 2; border: 1px solid green">
+  <div style="column-count: 2; border: 1px solid green">
    <span>AAAA
     <div style="float: left;border: 1px solid blue">BBBB
     </div>
    </span>
   </div>
  </body>
 </html>
--- a/layout/generic/crashtests/413582-1.xhtml
+++ b/layout/generic/crashtests/413582-1.xhtml
@@ -1,9 +1,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 </head>
 <body>
 
-<div style="-moz-column-count: 2; text-indent: 11px;"> <div style="float: right;"></div><select style="float: right;"></select></div>
+<div style="column-count: 2; text-indent: 11px;"> <div style="float: right;"></div><select style="float: right;"></select></div>
     
 </body>
 </html>
--- a/layout/generic/crashtests/413582-2.html
+++ b/layout/generic/crashtests/413582-2.html
@@ -1,9 +1,9 @@
 <html>
 <head></head>
 <body>
-<div style="-moz-column-count: 2;">r
+<div style="column-count: 2;">r
 <span style="float: right;"></span>
 <textarea style="float: left;"></textarea>
 </div>
 </body>
 </html>
--- a/layout/generic/crashtests/414061-1.html
+++ b/layout/generic/crashtests/414061-1.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
-<body style="width: 1px; white-space: pre; -moz-column-width: 1px;">
+<body style="width: 1px; white-space: pre; column-width: 1px;">
 
 x
 
 <div style="margin: -200em;"></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/414719-1.html
+++ b/layout/generic/crashtests/414719-1.html
@@ -11,15 +11,15 @@ function boom()
   ispan.parentNode.insertBefore(newDiv, ispan);
 }
 
 </script>
 </head>
 
 <body onload="boom();">
 
-<div style="-moz-column-count: 1; position: fixed;"><div style="overflow: -moz-hidden-unscrollable; display: table-header-group; white-space: pre; position: absolute;">
+<div style="column-count: 1; position: fixed;"><div style="overflow: -moz-hidden-unscrollable; display: table-header-group; white-space: pre; position: absolute;">
  <span id="ispan">
 </span></div></div>
 
 </body>
 
 </html>
--- a/layout/generic/crashtests/415685-1.html
+++ b/layout/generic/crashtests/415685-1.html
@@ -4,11 +4,11 @@
 <head>
 <style type="text/css">
 
 div { height: 10px; margin: 1em; outline: 1px inset black; }
 
 </style>
 </head>
 
-<body onload="document.getElementById('a').style.padding = '12em 0';" style="-moz-column-count: 2; width: 1px;"><div id="a">aaaa aaaa aaaa</div><div style="border: medium solid blue;"></div><div style="border: medium solid green; margin: 10em 0pt;"></div><div style="border: medium solid magenta;"></div>xxxx xxxx xxxx</body>
+<body onload="document.getElementById('a').style.padding = '12em 0';" style="column-count: 2; width: 1px;"><div id="a">aaaa aaaa aaaa</div><div style="border: medium solid blue;"></div><div style="border: medium solid green; margin: 10em 0pt;"></div><div style="border: medium solid magenta;"></div>xxxx xxxx xxxx</body>
 
 </html>
--- a/layout/generic/crashtests/416165.html
+++ b/layout/generic/crashtests/416165.html
@@ -2,17 +2,17 @@
 <head>
 <script>
 function replacestyles(){
 document.getElementById('a').setAttribute('style', 'border: 1px solid black; -moz-border-radius: 2em;');
 document.body.offsetHeight; 
 }
 </script>
 </head>
-<body  style="direction: rtl; -moz-column-count: 2;" onload="document.body.offsetHeight; setTimeout(replacestyles,0);">
+<body  style="direction: rtl; column-count: 2;" onload="document.body.offsetHeight; setTimeout(replacestyles,0);">
 
 <div id="a">
 <pre style="overflow: -moz-hidden-unscrollable;">
 
 
 text
 
 
--- a/layout/generic/crashtests/416264-1.html
+++ b/layout/generic/crashtests/416264-1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 
-<body style="display: -moz-box;"><div style="-moz-column-count: 2;"><div style="height: 200px;"></div><span style="display: inline-block; width: 100px;"></span></div></body>
+<body style="display: -moz-box;"><div style="column-count: 2;"><div style="height: 200px;"></div><span style="display: inline-block; width: 100px;"></span></div></body>
 
 </html>
--- a/layout/generic/crashtests/416476-1.html
+++ b/layout/generic/crashtests/416476-1.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<html><head></head><body></body><body style="width: 800px; -moz-column-count: 4;"><div style="height: 80px; outline-color: blue; outline-style: solid; outline-width: 1px;"></div><div style="height: 80px; outline-color: green; outline-style: solid; outline-width: 1px;"><div style="float: left; height: 10px; width: 10px; outline-color: red; outline-style: solid; outline-width: 1px;"></div><div style="padding: 180px; -moz-column-count: 1; clear: right; outline-color: magenta; outline-style: solid; outline-width: 1px;"></div></div></body></html>
+<html><head></head><body></body><body style="width: 800px; column-count: 4;"><div style="height: 80px; outline-color: blue; outline-style: solid; outline-width: 1px;"></div><div style="height: 80px; outline-color: green; outline-style: solid; outline-width: 1px;"><div style="float: left; height: 10px; width: 10px; outline-color: red; outline-style: solid; outline-width: 1px;"></div><div style="padding: 180px; column-count: 1; clear: right; outline-color: magenta; outline-style: solid; outline-width: 1px;"></div></div></body></html>
--- a/layout/generic/crashtests/417848-1.xhtml
+++ b/layout/generic/crashtests/417848-1.xhtml
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head></head>
-  <body style="-moz-column-count: 15; font-size: 144em;">
+  <body style="column-count: 15; font-size: 144em;">
     <svg xmlns="http://www.w3.org/2000/svg" style="min-width: 10em;"></svg>
   </body>
 </html>
--- a/layout/generic/crashtests/417902-1.html
+++ b/layout/generic/crashtests/417902-1.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 
-body { width: 500px; -moz-column-count: 2; }
+body { width: 500px; column-count: 2; }
 body:first-letter { float: right; }
 #s { padding: 0pt 200px; }
 
 </style>
 <script type="text/javascript">
 
 function boom()
 {
--- a/layout/generic/crashtests/417902-2.html
+++ b/layout/generic/crashtests/417902-2.html
@@ -3,17 +3,17 @@
   <style>
     div:first-letter {
       float: left;
       background: orange;
     }
     /* Note: there's an upper-bound on widths that trigger a crash.
        This bound depends on the width of the characters in the div. */
     div#v {
-      -moz-column-count: 2;
+      column-count: 2;
       width: 30px;
       height: 1em;
       background: lightblue;
     }
   </style>
   <script>
     function boom() {
       var v = document.getElementById("v");
--- a/layout/generic/crashtests/418532-1.html
+++ b/layout/generic/crashtests/418532-1.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 div:first-line { font-size: 80%; color: green; }
 </style>
 </head>
-<body style="-moz-column-width: 1px"><div id="div" style="-moz-column-width: 1px"> <span>Foo bar</span></div></body>
+<body style="column-width: 1px"><div id="div" style="column-width: 1px"> <span>Foo bar</span></div></body>
 </html>
--- a/layout/generic/crashtests/418932-1.html
+++ b/layout/generic/crashtests/418932-1.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<html><head></head><body><div style="-moz-column-width: 2880000em;"></div></body></html>
+<html><head></head><body><div style="column-width: 2880000em;"></div></body></html>
--- a/layout/generic/crashtests/420000-1.html
+++ b/layout/generic/crashtests/420000-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 <body>
 
-<div style="-moz-column-gap: 24000000em; -moz-column-count: 5;"></div>
+<div style="column-gap: 24000000em; column-count: 5;"></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/421671.html
+++ b/layout/generic/crashtests/421671.html
@@ -1,10 +1,10 @@
 <marquee>
-<xmp style="-moz-column-count: 99999999">
+<xmp style="column-count: 99999999">
 
 <a>
 
 <a>
 
 <a>
 
 <a>
@@ -194,9 +194,9 @@
 <a>
 <a>
 <a>
 																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																						
 <a>
 <a>
 
 <a>
-<a>
\ No newline at end of file
+<a>
--- a/layout/generic/crashtests/422283-1.html
+++ b/layout/generic/crashtests/422283-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head></head>
 
-<body style="-moz-column-width: 1px;"><div style="padding: 150px 0; height: 80px;"><span>
+<body style="column-width: 1px;"><div style="padding: 150px 0; height: 80px;"><span>
 </span>x<div></div><span>
 </span>a ! b c<div></div>
 </div></body>
 
 </html>
--- a/layout/generic/crashtests/422301-1.html
+++ b/layout/generic/crashtests/422301-1.html
@@ -14,11 +14,11 @@ function boom()
 {
   document.getElementById("b").style.padding = "";
   document.getElementById("a").style.padding = "12em";
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="-moz-column-width: 2em;"><div id="a"></div><div></div><div></div><div id="b" style="padding: 12em;">This is text</div>This is textThis is text<div>This is text</div></body>
+<body onload="boom();" style="column-width: 2em;"><div id="a"></div><div></div><div></div><div id="b" style="padding: 12em;">This is text</div>This is textThis is text<div>This is text</div></body>
 
 </html>
--- a/layout/generic/crashtests/423055-1.html
+++ b/layout/generic/crashtests/423055-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML>
 <html>
 <head></head>
 <body>
 
-<div style="white-space: pre; position: relative; -moz-column-count: 2;">
+<div style="white-space: pre; position: relative; column-count: 2;">
 <div style="position: absolute;"></div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/423098.html
+++ b/layout/generic/crashtests/423098.html
@@ -7,16 +7,16 @@ function boom()
   document.getElementById("b").style.position = "static";
   document.body.offsetHeight;
   document.getElementById("a").style.fontSize = "110%";
 }
 
 </script>
 </head>
 
-<body style="-moz-column-count: 1;" onload="boom();">
+<body style="column-count: 1;" onload="boom();">
   <div id="a" style="float: right; height: 80px;">
     <div id="b" style="position: absolute; height: 10px;"></div>
     <div style="height: 100px; width: 11px;"></div>
   </div>
 </body>
 
 </html>
--- a/layout/generic/crashtests/423264-1.html
+++ b/layout/generic/crashtests/423264-1.html
@@ -10,10 +10,10 @@ function boom()
   document.body.offsetHeight;
   var z = document.createTextNode('Z');
   document.body.insertBefore(z, document.body.lastChild);
 }
 
 </script>
 </head>
 
-<body onload="boom();"><div style="-moz-column-count: 2; width: 1px;"><div id="a">M N矋<span>م</span></div></div>H</body>
+<body onload="boom();"><div style="column-count: 2; width: 1px;"><div id="a">M N矋<span>م</span></div></div>H</body>
 </html>
--- a/layout/generic/crashtests/426040-1.html
+++ b/layout/generic/crashtests/426040-1.html
@@ -16,13 +16,13 @@ function boom()
   document.documentElement.style.outline = "none";
 }
 
 </script>
 </head>
 
 <body onload="boom();">
 
-<div style="-moz-column-count: 2;" id="a"><div><div style="float: right;"><div></div><span><div></div></span></div></div></div>
+<div style="column-count: 2;" id="a"><div><div style="float: right;"><div></div><span><div></div></span></div></div></div>
 
 </body>
 
 </html>
--- a/layout/generic/crashtests/426272-1.html
+++ b/layout/generic/crashtests/426272-1.html
@@ -7,12 +7,12 @@ function boom()
 {
   var y = document.createTextNode('Y');
   document.body.insertBefore(y, document.getElementById("v").nextSibling);
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="-moz-column-count: 2; width: 10ch; letter-spacing: 1px; font-family: monospace;">
+<body onload="boom();" style="column-count: 2; width: 10ch; letter-spacing: 1px; font-family: monospace;">
 <div style="background: lightblue; float: right; height: 14em; width: 1ch;" id="v"></div>a bcd<span>&#x202B;X</span>
 </body>
 </html>
--- a/layout/generic/crashtests/428263-1.html
+++ b/layout/generic/crashtests/428263-1.html
@@ -8,11 +8,11 @@ function boom()
   document.documentElement.appendChild(document.body);
   document.documentElement.offsetHeight;
   document.documentElement.appendChild(document.body);
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="-moz-column-count: 2;"><div style="height: 1px;"></div><span style="display: inline-block;"></span></body>
+<body onload="boom();" style="column-count: 2;"><div style="height: 1px;"></div><span style="display: inline-block;"></span></body>
 
 </html>
--- a/layout/generic/crashtests/429981-1.html
+++ b/layout/generic/crashtests/429981-1.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 
     body {
       height: 100px;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
+      column-width: 100pt;
+      column-gap: 0;
     }
 
     #x { 
       padding: 100px;
     }
 
     #overflow {
       height: 400px;
--- a/layout/generic/crashtests/430744-1.html
+++ b/layout/generic/crashtests/430744-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 <body onload="document.getElementById('x').appendChild(document.createTextNode('b'));">
 
-<div style="display: -moz-grid;"><div style="-moz-column-count: 2;">a<div id="x" style="padding: 1em;"></div><wbr></div></div>
+<div style="display: -moz-grid;"><div style="column-count: 2;">a<div id="x" style="padding: 1em;"></div><wbr></div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/430991.html
+++ b/layout/generic/crashtests/430991.html
@@ -10,15 +10,15 @@ function boom()
 }
 
 </script>
 </head>
 
 <body onload="boom();">
 
 <ul id="ul">
-<li id="li" style="-moz-column-count: -1; white-space: pre-wrap;"><span>A</span><span>B</span><span style="float: right;"></span>
+<li id="li" style="column-count: -1; white-space: pre-wrap;"><span>A</span><span>B</span><span style="float: right;"></span>
 
 </li>
 </ul>
 
 </body>
 </html>
--- a/layout/generic/crashtests/435529.html
+++ b/layout/generic/crashtests/435529.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 
   div { 
-    -moz-column-count: 2;
+    column-count: 2;
     white-space: pre; 
   }
   
   div:first-letter { 
     float: right;
   }
 
 </style>
--- a/layout/generic/crashtests/436194-1.html
+++ b/layout/generic/crashtests/436194-1.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 
-#colset { -moz-column-count: 2; outline: 1px solid orange; }
+#colset { column-count: 2; outline: 1px solid orange; }
 .ib { height: 100px; display: inline-block; outline: 1px solid blue; }
 div { outline: 1px solid green; }
 span { outline: 1px solid magenta; }
 
 </style>
 </head>
 <body>
 
--- a/layout/generic/crashtests/436602-1.html
+++ b/layout/generic/crashtests/436602-1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <body>
 
-<div style="-moz-column-width: 1px;"><span>A B C D E</span> <span style="float: right;"></span> <br> </div>
+<div style="column-width: 1px;"><span>A B C D E</span> <span style="float: right;"></span> <br> </div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/436823.html
+++ b/layout/generic/crashtests/436823.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 <body>
 
-<div style="-moz-column-count: -1;"><div style="float: left;"><div><div style="float: left;">A B</div><div style="clear: both; height: 1px;"></div></div></div></div>
+<div style="column-count: -1;"><div style="float: left;"><div><div style="float: left;">A B</div><div style="clear: both; height: 1px;"></div></div></div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/436969-1.html
+++ b/layout/generic/crashtests/436969-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 <body onload="document.documentElement.style.zIndex = 2;">
 
-<div style="direction: rtl; text-transform: uppercase; width: 1px;"><div style="position: absolute; -moz-column-count: 2;"><span style="padding: 6em 0pt; position: absolute; height: 1.2em;">A !BB CCC D,</span></div></div>
+<div style="direction: rtl; text-transform: uppercase; width: 1px;"><div style="position: absolute; column-count: 2;"><span style="padding: 6em 0pt; position: absolute; height: 1.2em;">A !BB CCC D,</span></div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/437156-1.html
+++ b/layout/generic/crashtests/437156-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
 </head>
 <body onload="document.getElementById('c').style.counterIncrement = 'c';">
 
-<div style="-moz-column-width: 1px;"><div id="c"><div style="float: right;">T<iframe></iframe></div></div></div>
+<div style="column-width: 1px;"><div id="c"><div style="float: right;">T<iframe></iframe></div></div></div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/generic/crashtests/438266-1.html
+++ b/layout/generic/crashtests/438266-1.html
@@ -18,16 +18,16 @@ function boom()
 
 <body onload="boom()">
 
 <table id="table">
   <tbody>
     <tr>
       <td>
         <div><hr width="7000" id="hr"></div>
-        <div style="-moz-column-width: 100px;">x<li></li></div>
+        <div style="column-width: 100px;">x<li></li></div>
       </td>
     </tr>
   </tbody>
 </table>
 
 </body>
 </html>
--- a/layout/generic/crashtests/442860-1.xul
+++ b/layout/generic/crashtests/442860-1.xul
@@ -1,1 +1,1 @@
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><hbox style="display: block; -moz-column-count: 15;"><scrollbar height="656119391073809204" style="position: fixed; -moz-appearance: tooltip;"/></hbox></window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><hbox style="display: block; column-count: 15;"><scrollbar height="656119391073809204" style="position: fixed; -moz-appearance: tooltip;"/></hbox></window>
--- a/layout/generic/crashtests/443528-1.html
+++ b/layout/generic/crashtests/443528-1.html
@@ -9,11 +9,11 @@ function boom()
   document.body.insertBefore(document.createTextNode("\n   "), s);
   document.body.offsetHeight;
   s.appendChild(document.createElement("span"));
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="-moz-column-count: 2; font-size: 1500px; white-space: pre-wrap;"><span id="s" style="display: inline-block"></span><div style="height: 100px;"></div></body>
+<body onload="boom();" style="column-count: 2; font-size: 1500px; white-space: pre-wrap;"><span id="s" style="display: inline-block"></span><div style="height: 100px;"></div></body>
 
 </html>
--- a/layout/generic/crashtests/448996-1.html
+++ b/layout/generic/crashtests/448996-1.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 
 body { font-family: monospace; width: 10ch; outline: 1px solid black; }
-div { -moz-column-width: 0.4px; -moz-column-gap: 3ch; }
+div { column-width: 0.4px; column-gap: 3ch; }
 b { font-weight: inherit; display: inline-block; }
 #r { border: 1px solid red; }
 #r:before { content: ""; }
 
 </style>
 
 <script type="text/javascript">
 
--- a/layout/generic/crashtests/451315-1.html
+++ b/layout/generic/crashtests/451315-1.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <html>
 <head></head>
-<body style="float: right; height: 2px;" onload="document.body.style.width = '0';"><div style="-moz-column-count: 3;"><div style="padding: 268435457mm;">A B C D</div></div></body>
+<body style="float: right; height: 2px;" onload="document.body.style.width = '0';"><div style="column-count: 3;"><div style="padding: 268435457mm;">A B C D</div></div></body>
 </html>
--- a/layout/generic/crashtests/452157-1.html
+++ b/layout/generic/crashtests/452157-1.html
@@ -1,8 +1,8 @@
 <html>
 <head></head>
 <body>
 
-<div style="float: left; -moz-column-count: 3;"><div><div style="margin: 1em 0pt; float: left;"><span style="display: inline-block; width: 16px; height: 16px;"></span></div><div style="margin: 1em 0pt; float: left;"></div><br style="display: inherit; clear: both;"> </div></div>
+<div style="float: left; column-count: 3;"><div><div style="margin: 1em 0pt; float: left;"><span style="display: inline-block; width: 16px; height: 16px;"></span></div><div style="margin: 1em 0pt; float: left;"></div><br style="display: inherit; clear: both;"> </div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/452157-2.html
+++ b/layout/generic/crashtests/452157-2.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <style>
   div.a  {
-    -moz-column-count: 2;
+    column-count: 2;
     float: left;
     background: lightblue;
   }
   div.b  {}
   div.c  {
     float: left;
     height: 23px;
     width:  10px;
--- a/layout/generic/crashtests/452157-3.html
+++ b/layout/generic/crashtests/452157-3.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <style>
   div.a  {
-    -moz-column-count: 2;
+    column-count: 2;
     position: absolute;
     background: lightblue;
   }
   div.b  {}
   div.c  {
     float: left;
     height: 23px;
     width:  10px;
--- a/layout/generic/crashtests/455643-1.xhtml
+++ b/layout/generic/crashtests/455643-1.xhtml
@@ -8,12 +8,12 @@ function boom()
   document.documentElement.offsetHeight;
   document.getElementById("g").style.textAlign = "";
 }
 
 </script>
 </head>
 
 <body onload="boom();">
-<div style="text-align: right;" id="g"><div style="direction: rtl; max-width: -moz-fit-content;"><div style="-moz-column-width: 1px;">A B<hr/>C D <input/><hr/></div><div id="k"><div style="width: 150px; float: right;"/><div style="width: 100px; float: right;"/></div><div style="padding-left: 40px;"/></div></div>
+<div style="text-align: right;" id="g"><div style="direction: rtl; max-width: -moz-fit-content;"><div style="column-width: 1px;">A B<hr/>C D <input/><hr/></div><div id="k"><div style="width: 150px; float: right;"/><div style="width: 100px; float: right;"/></div><div style="padding-left: 40px;"/></div></div>
 </body>
 
 </html>
--- a/layout/generic/crashtests/457375.html
+++ b/layout/generic/crashtests/457375.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <html>
 <head></head>
-<body style="-moz-column-width: 1px;" onload="document.getElementById('v').style.height = '0';"><div id="v"><span>A B&#0;</span><span>C</span><span> D</span></div></body>
+<body style="column-width: 1px;" onload="document.getElementById('v').style.height = '0';"><div id="v"><span>A B&#0;</span><span>C</span><span> D</span></div></body>
 </html>
--- a/layout/generic/crashtests/462968.xhtml
+++ b/layout/generic/crashtests/462968.xhtml
@@ -1,5 +1,5 @@
 <html xmlns="http://www.w3.org/1999/xhtml"><head></head><body onload="var td = document.getElementById('td'); td.parentNode.removeChild(td);">
 
-<div style="-moz-column-count: 2;"><div style="padding: 881977875840684in 0pt;"><span style="padding: 0pt 881977875840684in;"><div style="padding-top: 881977875840684in; clear: both;"></div><span><div><td id="td"></td></div></span></span></div></div>
+<div style="column-count: 2;"><div style="padding: 881977875840684in 0pt;"><span style="padding: 0pt 881977875840684in;"><div style="padding-top: 881977875840684in; clear: both;"></div><span><div><td id="td"></td></div></span></span></div></div>
 
 </body></html>
--- a/layout/generic/crashtests/463350-1.html
+++ b/layout/generic/crashtests/463350-1.html
@@ -8,10 +8,10 @@ function boom()
   document.getElementById("select").appendChild(document.createElement("span"));
   document.documentElement.offsetHeight;
   document.getElementById("z").appendChild(document.createElement("span"));
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="-moz-column-count: 2; height: 72496331mm;"><fieldset><span id="z"><div><div></div></div><select id="select"></select></span></fieldset></body>
+<body onload="boom();" style="column-count: 2; height: 72496331mm;"><fieldset><span id="z"><div><div></div></div><select id="select"></select></span></fieldset></body>
 </html>
--- a/layout/generic/crashtests/463350-2.html
+++ b/layout/generic/crashtests/463350-2.html
@@ -8,10 +8,10 @@ function boom()
   document.getElementById("select").appendChild(document.createElement("span"));
   document.documentElement.offsetHeight;
   document.getElementById("z").appendChild(document.createElement("span"));
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="-moz-column-count: 2; height: 0;"><fieldset><span id="z"><div><div></div></div><select id="select"></select></span></fieldset></body>
+<body onload="boom();" style="column-count: 2; height: 0;"><fieldset><span id="z"><div><div></div></div><select id="select"></select></span></fieldset></body>
 </html>
--- a/layout/generic/crashtests/463350-3.html
+++ b/layout/generic/crashtests/463350-3.html
@@ -6,10 +6,10 @@
 function boom()
 {
   document.getElementById("select").appendChild(document.createElement("span"));
 }
 
 </script>
 </head>
 
-<body onload="setTimeout('boom()', 500);" style="-moz-column-count: 2; height: 0;"><fieldset><span id="z"><div><div></div></div><select id="select"></select></span></fieldset></body>
+<body onload="setTimeout('boom()', 500);" style="column-count: 2; height: 0;"><fieldset><span id="z"><div><div></div></div><select id="select"></select></span></fieldset></body>
 </html>
--- a/layout/generic/crashtests/463741-1.html
+++ b/layout/generic/crashtests/463741-1.html
@@ -11,10 +11,10 @@ function boom()
   v.parentNode.removeChild(v);
   var w = document.createElement("span");
   document.body.insertBefore(w, document.body.lastChild);
 }
 
 </script>
 </head>
 
-<body onload="boom();"><div></div><div style="height: 1px;"><span><div id="v"></div></span><div style="-moz-column-count: 2;">A<div style="margin: 67108863ch 0pt;">B</div><div>C</div></div></div><span></span></body>
+<body onload="boom();"><div></div><div style="height: 1px;"><span><div id="v"></div></span><div style="column-count: 2;">A<div style="margin: 67108863ch 0pt;">B</div><div>C</div></div></div><span></span></body>
 </html>
--- a/layout/generic/crashtests/463785.xhtml
+++ b/layout/generic/crashtests/463785.xhtml
@@ -5,17 +5,17 @@
 <content>
 <div xmlns="http://www.w3.org/1999/xhtml" style="border: 100px solid red;">
 <div  style="position: fixed;"/>
 </div>
 </content>
 </binding>
 </bindings>
 
-<div style="position: absolute; -moz-column-count: 2;">
+<div style="position: absolute; column-count: 2;">
 <table style="border: 100px solid green;" id="c">
 <tr id="b" style="-moz-binding:url(#xbl)">
 <td style="position: absolute;">
 m
   <span id="a">
     <div style="border: 100px solid black;">
        <div style="position: fixed;"/>
     </div>
--- a/layout/generic/crashtests/465651-1.html
+++ b/layout/generic/crashtests/465651-1.html
@@ -20,17 +20,17 @@
     height: 5px;
 }
 
 </style>
 
 </head>
 
 <body>
-    <div style="width: 41px; -moz-column-count: 3;">
+    <div style="width: 41px; column-count: 3;">
         <div class="contain"></div>
         <div class="contain"></div>
         <div class="fl"></div>
         <div class="fl"></div>
         <div class="fr"></div>
         <div></div>
         <div class="fr"></div>
         <div class="contain"><div class="fl"></div></div>
--- a/layout/generic/crashtests/467493-1.html
+++ b/layout/generic/crashtests/467493-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head></head>
 <body>
-<div style="-moz-column-count: 15; overflow-y: hidden;"><div><div style="clear: both; margin: 144115188075855870cm"><li></li></div><div style="position: fixed;"></div></div></div>
+<div style="column-count: 15; overflow-y: hidden;"><div><div style="clear: both; margin: 144115188075855870cm"><li></li></div><div style="position: fixed;"></div></div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/467493-2.html
+++ b/layout/generic/crashtests/467493-2.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head><style>
   div.a {
-    -moz-column-count: 2;
+    column-count: 2;
     overflow-y: hidden;
     background: yellow;
   }
   div.b {
     background: orange;
     clear: both;
     margin-top: 946982.46874999995cm;
   }
--- a/layout/generic/crashtests/468207-1.html
+++ b/layout/generic/crashtests/468207-1.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <html>
 <head></head>
-<body><div style="-moz-column-width: 1px;"><div style="height: 5em;"><div style="height: 1em;"></div><div style="height: 5em; float: right;"></div></div><div style="height: 1em;"></div><div style="float: right;"></div><div style="float: left; height: 5em;"></div></div></body>
+<body><div style="column-width: 1px;"><div style="height: 5em;"><div style="height: 1em;"></div><div style="height: 5em; float: right;"></div></div><div style="height: 1em;"></div><div style="float: right;"></div><div style="float: left; height: 5em;"></div></div></body>
 </html>
--- a/layout/generic/crashtests/468771-1.xhtml
+++ b/layout/generic/crashtests/468771-1.xhtml
@@ -16,12 +16,12 @@ function boom()
 }
 
 </script>
 
 </head>
 
 <body onload="boom();">
 
-<table id="table">AAAA<tr id="tr1"></tr><tr><td><div style="-moz-column-width: 1px;">B C</div></td></tr></table>
+<table id="table">AAAA<tr id="tr1"></tr><tr><td><div style="column-width: 1px;">B C</div></td></tr></table>
 
 </body>
 </html>
--- a/layout/generic/crashtests/468771-2.xhtml
+++ b/layout/generic/crashtests/468771-2.xhtml
@@ -11,12 +11,12 @@ function boom()
 }
 
 </script>
 
 </head>
 
 <body onload="boom();">
 
-<table id="table" border="1">AAAA<tr id="tr1"></tr><tr><td><div style="-moz-column-width: 1px;">B C</div></td></tr></table>
+<table id="table" border="1">AAAA<tr id="tr1"></tr><tr><td><div style="column-width: 1px;">B C</div></td></tr></table>
 
 </body>
 </html>
--- a/layout/generic/crashtests/469859-1.xhtml
+++ b/layout/generic/crashtests/469859-1.xhtml
@@ -15,17 +15,17 @@ function boom()
   document.documentElement.offsetHeight;
   document.getElementById("ss").disabled = false;
 }
 
 </script>
 </head>
 <body onload="boom();">
 
-<div style="-moz-column-width: 0;">
+<div style="column-width: 0;">
   <colgroup></colgroup>
   <div>
     <div id="o" style="float: left;"></div>
     <div style="clear: both;">A B<div style="float: left;"></div></div>
   </div>
 </div>
 
 </body>
--- a/layout/generic/crashtests/472587-1.xhtml
+++ b/layout/generic/crashtests/472587-1.xhtml
@@ -11,17 +11,17 @@ function boom()
 
 </script>
 </head>
 <body onload="boom();">
 
 <m:mrow>
   <span>
     <m:msup id="m"/>
-    <div style="-moz-column-width: 1px;">
+    <div style="column-width: 1px;">
       <m:munderover/>
       <m:msqrt/>
     </div>
   </span>
   <span id="s"></span>
 </m:mrow>
 
 </body>
--- a/layout/generic/crashtests/472617-1.xhtml
+++ b/layout/generic/crashtests/472617-1.xhtml
@@ -1,4 +1,4 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <head></head>
-<body style="-moz-column-width: 2351490cm;"><div style="height: 0;"><xul:hbox/><xul:button/><span style="float: right;"/></div><xul:button/><div/><span style="float: right;"/></body>
+<body style="column-width: 2351490cm;"><div style="height: 0;"><xul:hbox/><xul:button/><span style="float: right;"/></div><xul:button/><div/><span style="float: right;"/></body>
 </html>
--- a/layout/generic/crashtests/472774-1.html
+++ b/layout/generic/crashtests/472774-1.html
@@ -14,12 +14,12 @@ function boom()
 {
   document.getElementById("ss").textContent = "div div { height: 1px; }";
 }
 
 </script>
 </head>
 <body onload="boom();">
 
-<div style="-moz-column-width: 1px; word-wrap: break-word;"><div>ABCDE</div></div>
+<div style="column-width: 1px; word-wrap: break-word;"><div>ABCDE</div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/476241-1.html
+++ b/layout/generic/crashtests/476241-1.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<html><body><div style="-moz-column-gap: 1px; -moz-column-width: 1px;"><div style="-moz-column-width: 1px;"><div><div style="margin: 15000px 0pt; -moz-column-width: 1px;"><div style="height: 1px;">G P X<br style="margin: 15000px 0pt;"></div></div><div style="padding: 10px; height: 200px;"></div></div> </div><br style="margin: 15000px 0pt;"></div></body></html>
+<html><body><div style="column-gap: 1px; column-width: 1px;"><div style="column-width: 1px;"><div><div style="margin: 15000px 0pt; column-width: 1px;"><div style="height: 1px;">G P X<br style="margin: 15000px 0pt;"></div></div><div style="padding: 10px; height: 200px;"></div></div> </div><br style="margin: 15000px 0pt;"></div></body></html>
--- a/layout/generic/crashtests/477731-1.html
+++ b/layout/generic/crashtests/477731-1.html
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style type="text/css">body:first-letter { float: left; }</style>
 </head>
-<body style="-moz-column-width: 100000px;" onload="document.body.style.MozColumnWidth='';"> &#x08D9;</body>
+<body style="column-width: 100000px;" onload="document.body.style.MozColumnWidth='';"> &#x08D9;</body>
 </html>
--- a/layout/generic/crashtests/477928.html
+++ b/layout/generic/crashtests/477928.html
@@ -6,13 +6,13 @@
 function boom()
 {
   document.getElementById("a").appendChild(document.createTextNode("\n"));
 }
 
 </script>
 </head>
 <body onload="boom();">
-<div id="a" style="max-width: -moz-max-content; -moz-column-count: 2;"><span style="white-space: pre-line;"><span>
+<div id="a" style="max-width: -moz-max-content; column-count: 2;"><span style="white-space: pre-line;"><span>
 </span>
 </span></div>
 </body>
 </html>
--- a/layout/generic/crashtests/478131-1.html
+++ b/layout/generic/crashtests/478131-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style id="s"></style>
 </head>
-<body onload="document.getElementById('s').textContent = '* { font-size: 8193%; }';" style="-moz-column-count: 2;"><div><div>A B C</div></div><div><p>D E F</p></div><p>G H I</p><div><p>.</p></div> <p>J K L</p></body>
+<body onload="document.getElementById('s').textContent = '* { font-size: 8193%; }';" style="column-count: 2;"><div><div>A B C</div></div><div><p>D E F</p></div><p>G H I</p><div><p>.</p></div> <p>J K L</p></body>
 </html>
--- a/layout/generic/crashtests/478170-1.html
+++ b/layout/generic/crashtests/478170-1.html
@@ -7,11 +7,11 @@ function bounce()
   var dE = document.documentElement;
   dE.removeChild(b);
   dE.offsetHeight;
   dE.appendChild(b)
 }
 </script>
 </head>
 <body onload="bounce();">
-<table><tbody><tr><td><div style="-moz-column-count: 2;"><div><span style="font-size: 91735350in;"><table><tbody><tr><td></td></tr></tbody></table><div><p><select></select></p><table><tbody><tr><td></td></tr></tbody></table></div></span></div><div style="height: 300px;"></div></div></td></tr></tbody><thead></thead></table>
+<table><tbody><tr><td><div style="column-count: 2;"><div><span style="font-size: 91735350in;"><table><tbody><tr><td></td></tr></tbody></table><div><p><select></select></p><table><tbody><tr><td></td></tr></tbody></table></div></span></div><div style="height: 300px;"></div></div></td></tr></tbody><thead></thead></table>
 </body>
 </html>
--- a/layout/generic/crashtests/478185-1.html
+++ b/layout/generic/crashtests/478185-1.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 
 #v {
-  -moz-column-count: 2;
+  column-count: 2;
   direction: rtl;
   white-space: pre-wrap;
   word-wrap: break-word;
   text-transform: capitalize;
   letter-spacing: 163851344580570600em;
 }
 
 #v:first-letter { }
--- a/layout/generic/crashtests/479938-1.html
+++ b/layout/generic/crashtests/479938-1.html
@@ -13,11 +13,11 @@ function boom2()
 {
   document.body.removeChild(document.getElementById("colset"));
   document.documentElement.removeAttribute("class");
 }
 
 </script>
 </head>
 
-<body onload="boom();"> <div style="-moz-column-count: 2;" id="colset"><div style="height: 1px;"><div id="x"><div style="width: 1px;">A B C D</div></div></div></div> </body>
+<body onload="boom();"> <div style="column-count: 2;" id="colset"><div style="height: 1px;"><div id="x"><div style="width: 1px;">A B C D</div></div></div></div> </body>
 
 </html>
--- a/layout/generic/crashtests/489477.html
+++ b/layout/generic/crashtests/489477.html
@@ -11,11 +11,11 @@ function boom()
   document.execCommand("outdent", false, null);
   document.getElementById("q").appendChild(document.createTextNode('v'));
   document.documentElement.removeAttribute("class");
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="width: 800px; -moz-column-count: 4; column-count: 4;"><div contenteditable="true" style="height: 80px;"><div><div><hr><span> </span></div></div></div><div id="q" style="height: 80px;"><div style="float: left; height: 10px; width: 10px;"></div><div style="padding: 180px; -moz-column-count: 1; column-count: 1; clear: right;"></div></div></body>
+<body onload="boom();" style="width: 800px; column-count: 4; column-count: 4;"><div contenteditable="true" style="height: 80px;"><div><div><hr><span> </span></div></div></div><div id="q" style="height: 80px;"><div style="float: left; height: 10px; width: 10px;"></div><div style="padding: 180px; column-count: 1; column-count: 1; clear: right;"></div></div></body>
 </html>
 
--- a/layout/generic/crashtests/489480-1.xhtml
+++ b/layout/generic/crashtests/489480-1.xhtml
@@ -1,1 +1,1 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="-moz-column-count: 2; width: 0pt;"><body style="height: 5003810179.579391in;"><br/><div style="direction: rtl;"><select style="float: right;"></select><option style="width: 0.6600934846211504px; margin: 22367196.5776782cm;"><option style="-moz-column-count: 2;"></option></option></div></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="column-count: 2; width: 0pt;"><body style="height: 5003810179.579391in;"><br/><div style="direction: rtl;"><select style="float: right;"></select><option style="width: 0.6600934846211504px; margin: 22367196.5776782cm;"><option style="column-count: 2;"></option></option></div></body></html>
--- a/layout/generic/crashtests/493118-1.html
+++ b/layout/generic/crashtests/493118-1.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" style="-moz-column-count: 2;">
+<html xmlns="http://www.w3.org/1999/xhtml" style="column-count: 2;">
 <body style="padding: 731563462617733px; height: 10px;">
 <div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/493649.html
+++ b/layout/generic/crashtests/493649.html
@@ -1,5 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="position: fixed; -moz-column-count: 3; white-space: pre;"><body style="height: 0pt;">
+<html xmlns="http://www.w3.org/1999/xhtml" style="position: fixed; column-count: 3; white-space: pre;"><body style="height: 0pt;">
 
 
 
 </body></html>
--- a/layout/generic/crashtests/495875-1.html
+++ b/layout/generic/crashtests/495875-1.html
@@ -1,7 +1,7 @@
 <html>
 <head></head>
-<body style="-moz-column-count: 2; white-space: pre-wrap; font-size-adjust: 4294967297; text-transform: uppercase;"
+<body style="column-count: 2; white-space: pre-wrap; font-size-adjust: 4294967297; text-transform: uppercase;"
       onload="document.body.style.fontSizeAdjust = '';"
 >&#xD558;A B C&#x0643;&#x5599;D
 
 </body></html>
--- a/layout/generic/crashtests/495875-2.html
+++ b/layout/generic/crashtests/495875-2.html
@@ -1,7 +1,7 @@
 <html>
 <head></head>
-<body style="-moz-column-count: 2; white-space: pre-wrap; font-size-adjust: 4294967297; text-transform: uppercase;"
+<body style="column-count: 2; white-space: pre-wrap; font-size-adjust: 4294967297; text-transform: uppercase;"
       onload="document.body.style.fontSizeAdjust = '';"
 >&#xD558;A B C<b>&#x0443;</b>&#x5599;D
 
 </body></html>
--- a/layout/generic/crashtests/499138-iframe.html
+++ b/layout/generic/crashtests/499138-iframe.html
@@ -1,14 +1,14 @@
 <html>
 <head>
 
 </head>
 <body onload="document.getElementById('a').removeAttribute('style');setTimeout(function() {window.location.reload()}, 500);">
-<div style="overflow: scroll;  position: absolute; -moz-column-count: 2;">
+<div style="overflow: scroll;  position: absolute; column-count: 2;">
 
 <div style="position: absolute;">
 <input id="a" style="position: absolute;" type="radio">
 <object>
  &#1593; m &#1593; m &#1593; m &#1593; m &#1593; m &#1593; m
 <ul> &#1593; m &#1593; m &#1593; m</ul>
 </object>
 </div>
--- a/layout/generic/crashtests/499857-1.html
+++ b/layout/generic/crashtests/499857-1.html
@@ -6,17 +6,17 @@
 #relleft {
 	float: left;
 	width: 290px;
 	margin: 15px 0 0 0;
 }
 
 #fl:first-line {  }
 
-#cols { -moz-column-width: 4503599627370497mm; }
+#cols { column-width: 4503599627370497mm; }
 
 </style>
 
 <script type="text/javascript">
 
 function boom()
 {
   document.getElementById("x").setAttribute("id", "cols");
--- a/layout/generic/crashtests/499885-1.xhtml
+++ b/layout/generic/crashtests/499885-1.xhtml
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <bindings xmlns="http://www.mozilla.org/xbl"><binding id="emptybinding"><content></content></binding></bindings>
 </head>
-<body style="-moz-column-width: 1px;"><select/><li/><select style="height: 1777px; padding: 8796093022208pt; display: inherit; -moz-binding: url(#emptybinding);"/></body>
+<body style="column-width: 1px;"><select/><li/><select style="height: 1777px; padding: 8796093022208pt; display: inherit; -moz-binding: url(#emptybinding);"/></body>
 </html>
--- a/layout/generic/crashtests/503961-1.xhtml
+++ b/layout/generic/crashtests/503961-1.xhtml
@@ -1,12 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style type="text/css">
-  #colset    { -moz-column-count: 3; }
+  #colset    { column-count: 3; }
   #a         { height: 0px; }
   #b         { height: 2px; }
   #c         { height: 1px; }
   #d         { height: 2px; }
   #e         { height: 2px; }
 </style>
 <script type="text/javascript">
 function boom()
--- a/layout/generic/crashtests/503961-2.html
+++ b/layout/generic/crashtests/503961-2.html
@@ -1,20 +1,20 @@
 <html>
 <head>
   <style>
-    #colset { -moz-column-count: 3; }
+    #colset { column-count: 3; }
     #a { height: 0;   }
     #x { height: 3px; }
     #b { height: 0;   }
     #c { height: 2px; }
     #d { height: 2px; }
 
     /* Following style is just for visualization -- doesn't affect assertion */
-    #colset { -moz-column-gap: 0px; width: 18px; }
+    #colset { column-gap: 0px; width: 18px; }
     div { width: 5px;         }
     #a  { background: purple; }
     #x  { background: orange; }
     #b  { background: blue;   }
     #c  { background: black;  }
     #d  { background: lime;   }
   </style>
   <script>
--- a/layout/generic/crashtests/508168-1.html
+++ b/layout/generic/crashtests/508168-1.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" style="-moz-column-count: 2;">
+<html xmlns="http://www.w3.org/1999/xhtml" style="column-count: 2;">
 <body style="padding: 731563462617733px; height: 10px;">
 <div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/509749-1.html
+++ b/layout/generic/crashtests/509749-1.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html style="-moz-column-width: 1px;">
+<html style="column-width: 1px;">
 <head></head>
 <body><div style="position: relative;"><div style="float: left; padding: 10px 20px 0pt;"><div style="position: absolute; top: 0pt;"><div></div><div style="position: fixed;"></div>S</div></div><div style="clear: both; padding: 20px 20px 15px;"></div></div></body>
 </html>
--- a/layout/generic/crashtests/511482.html
+++ b/layout/generic/crashtests/511482.html
@@ -1,12 +1,12 @@
 <html>
   <body>
   <div style="border: 5px solid blue;">
-    <div style="-moz-column-width: 530px;height:300px; border: 5px solid red;">
+    <div style="column-width: 530px;height:300px; border: 5px solid red;">
       <div style="width:128px; height:128px;border: 5px solid green" >
       <div style="width:128px; height:128px;border: 5px solid green" >
       <div style="width:128px; height:128px;border: 5px solid green" >
       <div style="width:128px; height:128px;border: 5px solid green" >
       <div style="width:128px; height:128px;border: 5px solid green" >
       <div style="width:128px; height:128px;border: 5px solid green" >
       <div style="width:128px; height:128px;border: 5px solid green" >
       <div style="width:128px; height:128px;border: 5px solid green" >
--- a/layout/generic/crashtests/512724-1.html
+++ b/layout/generic/crashtests/512724-1.html
@@ -1,1 +1,1 @@
-<html style="-moz-column-width: 1px; -moz-column-gap: 6834954840cm"><body></body></html>
+<html style="column-width: 1px; column-gap: 6834954840cm"><body></body></html>
--- a/layout/generic/crashtests/513394-1.html
+++ b/layout/generic/crashtests/513394-1.html
@@ -6,11 +6,11 @@
 content: "A"; 
 display: block; 
 height: 0; 
 clear: both; 
 }
 </style>
 </head>
 <body onload="document.getElementById('c').style.height = '20px';" style="width: 300px">
-<div style="-moz-column-count: 2;"><div style="width: 200px; float: left;"><div id="c" style="padding-top: 30px;"></div></div><div style="padding: 10px 0pt;"><div><div id="w"><div style="display: list-item; float: left; margin-right: 100px;"></div></div><div style="height: 20px; display: inline-block;"></div></div></div></div>
+<div style="column-count: 2;"><div style="width: 200px; float: left;"><div id="c" style="padding-top: 30px;"></div></div><div style="padding: 10px 0pt;"><div><div id="w"><div style="display: list-item; float: left; margin-right: 100px;"></div></div><div style="height: 20px; display: inline-block;"></div></div></div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/514800-1.html
+++ b/layout/generic/crashtests/514800-1.html
@@ -1,4 +1,4 @@
-<html style="position: absolute; overflow: hidden; -moz-column-count: 3;">
+<html style="position: absolute; overflow: hidden; column-count: 3;">
 <head></head>
 <body style="overflow-y: scroll;" onload="document.body.style.counterReset='c';"><div style="position: absolute; height: 200px;"></div></body>
 </html>
--- a/layout/generic/crashtests/515811-1.html
+++ b/layout/generic/crashtests/515811-1.html
@@ -1,5 +1,5 @@
 <html>
 <body onload="document.getElementById('x').style.fontSize = '4398046511103em';">
-<div style="float: left; -moz-column-count: 3;"><div><div id="x" style="margin: 1em 0pt;"></div><div style="float: left;"></div><div style="clear: both;"></div>Q</div></div>
+<div style="float: left; column-count: 3;"><div><div id="x" style="margin: 1em 0pt;"></div><div style="float: left;"></div><div style="clear: both;"></div>Q</div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/519031.xhtml
+++ b/layout/generic/crashtests/519031.xhtml
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head></head>
 <body onload="document.getElementById('a').appendChild(document.createTextNode(' '));">
-<div style="position: absolute; -moz-column-count: 2;"><div style="position: absolute; height: 100px;"><fieldset/><fieldset id="a"/></div></div>
+<div style="position: absolute; column-count: 2;"><div style="position: absolute; height: 100px;"><fieldset/><fieldset id="a"/></div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/520340.html
+++ b/layout/generic/crashtests/520340.html
@@ -1,2 +1,2 @@
 <!DOCTYPE HTML>
-<html style="-moz-column-width: 1px;"><head></head><body style="-moz-column-count: 2;">A B C D E F<span>&#x7E01;</span></body></html>
+<html style="column-width: 1px;"><head></head><body style="column-count: 2;">A B C D E F<span>&#x7E01;</span></body></html>
--- a/layout/generic/crashtests/522170-1.html
+++ b/layout/generic/crashtests/522170-1.html
@@ -1,1 +1,1 @@
-<html><div style="float: left; -moz-column-count: 3;"><div><div style="float: left; min-height: 7086320ch;"></div><div style="clear: both;"></div><span></span></div></div></html>
+<html><div style="float: left; column-count: 3;"><div><div style="float: left; min-height: 7086320ch;"></div><div style="clear: both;"></div><span></span></div></div></html>
--- a/layout/generic/crashtests/526217.html
+++ b/layout/generic/crashtests/526217.html
@@ -4,13 +4,13 @@
 function doe() {
 document.body.removeAttribute('style');
 document.documentElement.offsetHeight;
 document.documentElement.removeAttribute("class");
 }
 setTimeout(doe,100);
 </script>
 </head>
-<body style="position: fixed; -moz-column-count: 2; min-height: 100%; top: 50%; bottom: 50%; font-size: 900px;">
+<body style="position: fixed; column-count: 2; min-height: 100%; top: 50%; bottom: 50%; font-size: 900px;">
 m m
 <span style=" position: fixed;"></span>
 </body>
 </html>
--- a/layout/generic/crashtests/533379-1.html
+++ b/layout/generic/crashtests/533379-1.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style>
 body { width: 1px; }
-ul { -moz-column-count: 15; }
+ul { column-count: 15; }
 li  {list-style-position: inside; }
 li:first-letter {color: red; }
 </style>
 </head>
 
 <body>
 <ul><li><span>A B</span></li></ul>
 </body>
--- a/layout/generic/crashtests/533379-2.html
+++ b/layout/generic/crashtests/533379-2.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style>
 body { width: 1px; }
-ul { -moz-column-count: 2; }
+ul { column-count: 2; }
 li  {list-style-position: inside; }
 li:first-letter {color: red; }
 </style>
 </head>
 
 <body>
 <ul><li><span>A B</span></li></ul>
 </body>
--- a/layout/generic/crashtests/534082-1.html
+++ b/layout/generic/crashtests/534082-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head></head>
 <body style="font-family: monospace; width: 0;">
-<div style="-moz-column-count: 4;"><div>a b c d<span style="display: list-item;"></span></div></div>
+<div style="column-count: 4;"><div>a b c d<span style="display: list-item;"></span></div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/537645.xhtml
+++ b/layout/generic/crashtests/537645.xhtml
@@ -1,11 +1,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
 <head>
 <style>
 span { margin: inherit; }
-html, body { -moz-column-width: 1px; column-width: 1px; }
+html, body { column-width: 1px; column-width: 1px; }
 </style>
 </head>
 <body onload="document.getElementsByTagName('style')[0].setAttribute('foo', 'bar'); document.documentElement.removeAttribute('class');">
 <span><i><spacer /><caption /></i><span><span><div /></span></span></span>
 </body>
 </html>
--- a/layout/generic/crashtests/542136-1.html
+++ b/layout/generic/crashtests/542136-1.html
@@ -12,12 +12,12 @@ function boom()
 {
   document.execCommand("selectAll", false, null);
   document.execCommand("decreasefontsize", false, null);
 }
 
 </script>
 </head>
 
-<body onload="boom();" style="font-size: 0;"><div contenteditable="true" style="-moz-column-width: 1px; white-space: pre-line;">
+<body onload="boom();" style="font-size: 0;"><div contenteditable="true" style="column-width: 1px; white-space: pre-line;">
 <span>T</span>his is text</div></body>
 
 </html>
--- a/layout/generic/crashtests/545571-1.html
+++ b/layout/generic/crashtests/545571-1.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html>
 <head></head>
-<body onload="document.documentElement.appendChild(document.body); document.documentElement.offsetHeight; document.getElementsByTagName('span')[0].style.wordSpacing = '4px';" style="bottom: 15045000px; -moz-column-width: 1px; top: -26px; position: absolute"><div style="letter-spacing: -4129px"><span style="white-space: pre-line; padding: 21904664px; -moz-column-width: 1px; position: absolute; word-spacing: 1577097179334px; top: 281474976710655px">
+<body onload="document.documentElement.appendChild(document.body); document.documentElement.offsetHeight; document.getElementsByTagName('span')[0].style.wordSpacing = '4px';" style="bottom: 15045000px; column-width: 1px; top: -26px; position: absolute"><div style="letter-spacing: -4129px"><span style="white-space: pre-line; padding: 21904664px; column-width: 1px; position: absolute; word-spacing: 1577097179334px; top: 281474976710655px">
 ( :
 
 q</span></div></body>
 </html>
--- a/layout/generic/crashtests/553504-1.xhtml
+++ b/layout/generic/crashtests/553504-1.xhtml
@@ -1,4 +1,4 @@
 <html xmlns="http://www.w3.org/1999/xhtml" style="display: table;">
 <head><style>div {height: 10px; margin: 1em 0; }</style></head>
-<body style="-moz-column-count: 3; direction: rtl;"><div></div><div style="padding: 4503599627370495pt;">j<td></td></div></body>
+<body style="column-count: 3; direction: rtl;"><div></div><div style="padding: 4503599627370495pt;">j<td></td></div></body>
 </html>
--- a/layout/generic/crashtests/564968.xhtml
+++ b/layout/generic/crashtests/564968.xhtml
@@ -6,18 +6,18 @@
     }
     .overflow {
       height: 8em;
     }
     body {
       font-family: monospace;
       height: 8em;
       line-height: 1em;
-      -moz-column-count: 2;
-      -moz-column-gap: 0;
+      column-count: 2;
+      column-gap: 0;
     }
 </style>
 <script>
     function boom()
     {
       document.documentElement.offsetHeight;
       document.getElementById('x').style.display = 'none';
       document.documentElement.offsetHeight;
--- a/layout/generic/crashtests/569193-1.html
+++ b/layout/generic/crashtests/569193-1.html
@@ -1,6 +1,6 @@
-<html style="-moz-column-count: 2;"><body onload="document.body.style.height = '0'; document.body.style.margin = '1048575ch';" style="-moz-column-count: 2; font-size-adjust: 288230376151711740; white-space: pre-wrap;">
+<html style="column-count: 2;"><body onload="document.body.style.height = '0'; document.body.style.margin = '1048575ch';" style="column-count: 2; font-size-adjust: 288230376151711740; white-space: pre-wrap;">
 
 
 
 
-</body></html>
\ No newline at end of file
+</body></html>
--- a/layout/generic/crashtests/571975-1.html
+++ b/layout/generic/crashtests/571975-1.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html style="-moz-column-count: 15;">
+<html style="column-count: 15;">
 <head><style>.wrapper { height: 3em; line-height: 1em; }</style></head>
 <body><div class="wrapper"></div><div class="wrapper">A B C D E</div></body>
 </html>
--- a/layout/generic/crashtests/571995.xhtml
+++ b/layout/generic/crashtests/571995.xhtml
@@ -1,8 +1,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <body onload="document.getElementById('a').style.letterSpacing = '15ch';"></body>
-<span id="a" style="position: fixed; bottom: 0pt; top: 4095em; -moz-column-width: 1px;"><span style="-moz-column-count: 1; min-height: 2097150ch; font-size-adjust: 256; width: 89px; bottom: 35875px; min-width: -moz-min-content; position: absolute; top: 33554432ch; white-space: pre-line;">
+<span id="a" style="position: fixed; bottom: 0pt; top: 4095em; column-width: 1px;"><span style="column-count: 1; min-height: 2097150ch; font-size-adjust: 256; width: 89px; bottom: 35875px; min-width: -moz-min-content; position: absolute; top: 33554432ch; white-space: pre-line;">
 
 a b:
 c def:
 
  </span></span></html>
--- a/layout/generic/crashtests/580504-1.xhtml
+++ b/layout/generic/crashtests/580504-1.xhtml
@@ -1,9 +1,9 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="-moz-column-width: 1px">
+<html xmlns="http://www.w3.org/1999/xhtml" style="column-width: 1px">
 <head>
 
 <script>
 <![CDATA[
 
 function boom()
 {
   document.getElementById("d").focus();
--- a/layout/generic/crashtests/586806-1.html
+++ b/layout/generic/crashtests/586806-1.html
@@ -1,14 +1,14 @@
 <html class="reftest-wait">
 <head>
 <script>
 function doe2() {
 document.getElementById('b').style.position = 'static';
-document.getElementById('a').setAttribute('style', 'position: absolute; -moz-column-count: 2;');
+document.getElementById('a').setAttribute('style', 'position: absolute; column-count: 2;');
 document.documentElement.removeAttribute("class");
 }
 </script>
 </head>
 <style>body * {border: 1px solid black;}</style>
 <body onload="doe2();">
 <div style="width: 500px;border: 1px solid black;">
 <div style="display: inline-block; width: 100px; height: 100px;"></div>
--- a/layout/generic/crashtests/586806-2.html
+++ b/layout/generic/crashtests/586806-2.html
@@ -1,1 +1,1 @@
-<div style="-moz-column-count: 2; width: 241px;"><div style="display: inline-block; width: 240px; height: 100px;"></div>m</div>
+<div style="column-count: 2; width: 241px;"><div style="display: inline-block; width: 240px; height: 100px;"></div>m</div>
--- a/layout/generic/crashtests/586806-3.html
+++ b/layout/generic/crashtests/586806-3.html
@@ -1,9 +1,9 @@
 <body style="font-size: 16px">
 <div style="width: 400px;">
 mmmmmmmmmmmmmmmmmmmmmmm
-<span style="position: absolute; -moz-column-count: 2">mmmmmmmmmmmmmmmmmmmm
+<span style="position: absolute; column-count: 2">mmmmmmmmmmmmmmmmmmmm
 <div style="display: inline-block; width: 240px; height: 100px"></div>
 m mm mm mm mm mm mm mm mm m
 <div style="float: left;">m</div>
 </span>
 </div>
--- a/layout/generic/crashtests/586973-1.html
+++ b/layout/generic/crashtests/586973-1.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <style>
 hr::before { content:"b"; float:right;}
 </style>
 </head>
 <body>
-<hr style="-moz-column-count: 1;">
-</html>
\ No newline at end of file
+<hr style="column-count: 1;">
+</html>
--- a/layout/generic/crashtests/589002-1.html
+++ b/layout/generic/crashtests/589002-1.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <html>
-<body style="-moz-column-width: 1px; -moz-column-gap: 576460752303423500mozmm;"></body>
+<body style="column-width: 1px; column-gap: 576460752303423500mozmm;"></body>
 </html>
--- a/layout/generic/crashtests/600100.xhtml
+++ b/layout/generic/crashtests/600100.xhtml
@@ -1,1 +1,1 @@
-<html xmlns="http://www.w3.org/1999/xhtml"><head><style>*::first-line { } *::after { content: 'after text'; } *::before { content: 'before text'; } </style></head><body onload="document.documentElement.offsetHeight; document.getElementsByTagName('style')[0].appendChild(document.createTextNode(' '));" style="-moz-column-width: 0pt;"><div style="float: right;"><span style="overflow-y: auto; float: left;"></span></div></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><style>*::first-line { } *::after { content: 'after text'; } *::before { content: 'before text'; } </style></head><body onload="document.documentElement.offsetHeight; document.getElementsByTagName('style')[0].appendChild(document.createTextNode(' '));" style="column-width: 0pt;"><div style="float: right;"><span style="overflow-y: auto; float: left;"></span></div></body></html>
--- a/layout/generic/crashtests/606642.xhtml
+++ b/layout/generic/crashtests/606642.xhtml
@@ -7,10 +7,10 @@ function boom()
   document.documentElement.offsetHeight;
   var r = document.getElementById("r");
   r.parentNode.removeChild(r);
 }
 
 </script>
 </head>
 
-<body onload="boom();"><div style="-moz-column-count: 3; height: 2in;"><div style="position: relative;"><div id="r" style="position: absolute;"><div style="height: 0in;"><div style="height: 5in;"></div><div style="position: absolute; height: 5in;"></div></div></div></div></div></body>
+<body onload="boom();"><div style="column-count: 3; height: 2in;"><div style="position: relative;"><div id="r" style="position: absolute;"><div style="height: 0in;"><div style="height: 5in;"></div><div style="position: absolute; height: 5in;"></div></div></div></div></div></body>
 </html>
--- a/layout/generic/crashtests/616052-1.html
+++ b/layout/generic/crashtests/616052-1.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <html>
-<body style="-moz-column-count: 15; position: absolute; height: 0px;"><span><span style="width: 20px; height: 20px; float: left;"></span>AAA <div style="position: absolute;"></div></span></body>
+<body style="column-count: 15; position: absolute; height: 0px;"><span><span style="width: 20px; height: 20px; float: left;"></span>AAA <div style="position: absolute;"></div></span></body>
 </html>
--- a/layout/generic/crashtests/621424-1.html
+++ b/layout/generic/crashtests/621424-1.html
@@ -1,1 +1,1 @@
-<!DOCTYPE html><html style="-moz-column-width: 1px;"><body style="-moz-column-width: 1px;" onload="document.getElementById('x').style.cssFloat='';"><div style="height: 50px;"></div><div style="float: left; -moz-column-count: 3; height: 466px;"></div><div style="padding: 176px; float: right;" id="x"></div></body></html>
+<!DOCTYPE html><html style="column-width: 1px;"><body style="column-width: 1px;" onload="document.getElementById('x').style.cssFloat='';"><div style="height: 50px;"></div><div style="float: left; column-count: 3; height: 466px;"></div><div style="padding: 176px; float: right;" id="x"></div></body></html>
--- a/layout/generic/crashtests/641724.html
+++ b/layout/generic/crashtests/641724.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <style type="text/css" rel="stylesheet" media="all">
 .form-item { padding:30px; }
 .views-exposed-widget {float:left; clear:left;}
-.views-exposed-widgets {-moz-column-width:250px;}
+.views-exposed-widgets {column-width:250px;}
 .clearfix:after
 ,.clear-block:after{content:".";display:block;}
 </style>
 <script type="text/javascript">
 //<!-- DDBEGIN -->
 (function ()
 {
     var D = window.jQuery = window.$ = function (a, b)
--- a/layout/generic/crashtests/655462-1.html
+++ b/layout/generic/crashtests/655462-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html><html><head>
 
 
 </head>
 
 <body onload="document.getElementById('q').style.direction = 'rtl';">
 
-<div style="height: 80px; position: relative; -moz-column-count: 2;"><div style="margin-top: 40px; position: absolute; height: 100px;"></div><div style="position: absolute;" id="q"></div><div style="position: absolute;"></div></div>
+<div style="height: 80px; position: relative; column-count: 2;"><div style="margin-top: 40px; position: absolute; height: 100px;"></div><div style="position: absolute;" id="q"></div><div style="position: absolute;"></div></div>
 
 </body></html>
--- a/layout/generic/crashtests/660416.html
+++ b/layout/generic/crashtests/660416.html
@@ -8,10 +8,10 @@ function boom()
   document.documentElement.offsetHeight;
   var n = document.getElementById("a").firstChild;
   n.data = "";
   n.data = "z";
 }
 
 </script>
 </head>
-<body onload="boom();" style="-moz-column-count: 3;"><span id="a">x&#x202E;</span><span>y</span></body>
+<body onload="boom();" style="column-count: 3;"><span id="a">x&#x202E;</span><span>y</span></body>
 </html>
--- a/layout/generic/crashtests/673770.html
+++ b/layout/generic/crashtests/673770.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
-<html style="-moz-column-width: 1px;">
+<html style="column-width: 1px;">
   <head>
     <script>
       function boom()
       {
         document.documentElement.offsetHeight;
         document.body.style.height = "8px";
         document.documentElement.style.fontSize = "22050893469px";
         document.documentElement.offsetHeight;
         document.getElementById("x").style.counterReset = "chicken";
         document.documentElement.offsetHeight;
       }
     </script>
   </head>
-  <body style="-moz-column-width: 1px; -moz-column-fill: auto;" onload="boom();">
+  <body style="column-width: 1px; column-fill: auto;" onload="boom();">
     <hr size="100" color="blue"><div style="position: absolute;"></div><div id="x" style="height: 5px;"></div>
   </body>
 </html>
 
--- a/layout/generic/crashtests/682649-1.html
+++ b/layout/generic/crashtests/682649-1.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html style="position: relative; -moz-column-count: 3;" class="reftest-wait">
+<html style="position: relative; column-count: 3;" class="reftest-wait">
 
 <head>
 <script>
 function boom()
 {
   document.documentElement.offsetHeight;
   document.body.style.position = "";
   document.documentElement.offsetHeight;
--- a/layout/generic/crashtests/683702-1.xhtml
+++ b/layout/generic/crashtests/683702-1.xhtml
@@ -3,17 +3,17 @@
 <script>
   function doe() {
     document.getElementById('a').style.display = '';
     document.documentElement.removeAttribute("class");
   }
 </script>
 </head>
 <body onload="doe()">
-<div style="position: absolute; -moz-column-count: 2;">
+<div style="position: absolute; column-count: 2;">
 <table id="c">
 <div id="a" style="border: 100px solid black; display:none;"></div><tr>
 <td style="position: absolute;">
   <span>
     <div style="border: 100px solid black;"></div>
   </span>
 
 </td>
--- a/layout/generic/crashtests/691210.html
+++ b/layout/generic/crashtests/691210.html
@@ -1,5 +1,5 @@
-<html style="-moz-column-width: 1px;"><head>
+<html style="column-width: 1px;"><head>
 
 </head>
 
-<body><div style="position: relative; -moz-column-count: 6;"><div style="position: absolute; height: 9px;"></div><div style="height: 9px;"></div></div></body></html>
\ No newline at end of file
+<body><div style="position: relative; column-count: 6;"><div style="position: absolute; height: 9px;"></div><div style="height: 9px;"></div></div></body></html>
--- a/layout/generic/crashtests/718516.html
+++ b/layout/generic/crashtests/718516.html
@@ -1,17 +1,17 @@
 <!doctype html>
 <html>
   <head><title>Bug 718516</title>
     <script>
           function start ()
           {
             firstDirElement = document.createElement('dir');
             firstDirElement.style.cssText = '-moz-stack-sizing: ignore;' +
-              ' -moz-column-width: 16385px;';
+              ' column-width: 16385px;';
             textPathElement = document
               .createElementNS('http://www.w3.org/2000/svg', 'textPath');
             firstDirElement.appendChild(textPathElement);
             textPathParent = textPathElement.parentElement;
             firstDivElement = document.createElement('div');
             document.body.appendChild(firstDivElement);
             centerElement = document.createElement('center');
             firstDivElement.appendChild(centerElement);
@@ -25,17 +25,17 @@
           }
 
           function start_dataiframe0 ()
           {
             element2 = centerElement.ownerDocument.getElementById('ifr37311')
               .contentDocument.getElementById('element2');
             secondDirElement = document.createElement('dir');
             secondDirElement.style.cssText =
-              'visibility: inherit;-moz-column-count: 32771;';
+              'visibility: inherit;column-count: 32771;';
             feOffsetElement = document
               .createElementNS('http://www.w3.org/2000/svg', 'feOffset');
             centerElement.style.position = 'absolute';
             firstIFrameElement.id = 'ifr36578';
             element0 = feOffsetElement.ownerDocument.getElementById('ifr36578')
               .contentDocument
               .getElementById('element0');
             firstIFrameElement = document.createElement('iframe');
--- a/layout/generic/crashtests/723108.html
+++ b/layout/generic/crashtests/723108.html
@@ -1,10 +1,10 @@
 <html>
 <head>
 </head>
-<body style=" -moz-column-count: 2; ">m
+<body style=" column-count: 2; ">m
 <div style="width: 10px; ">m
-<div style="-moz-column-count: 2;  -moz-transform: scale(1); ">m
+<div style="column-count: 2;  -moz-transform: scale(1); ">m
 <span style="position: fixed;">m m</span>
 </div>
 </body>
 </html>
--- a/layout/generic/crashtests/724978.xhtml
+++ b/layout/generic/crashtests/724978.xhtml
@@ -9,51 +9,51 @@
     html {
       background: white;
     }
 
     .container {
       background: red;
       height: 24pt;
       position: relative;
-      -moz-column-count: 2;
-      -moz-column-gap: 0;
+      column-count: 2;
+      column-gap: 0;
     }
     .overflow {
       width: 10pt;
       border-bottom: lime 8px solid;
       top: 0;
     }
     .following {
       position: relative;
       background: white;
       width: 100pt;
     }
     #colset {
       padding-top: 1px;
       width: 300pt;
       height: 2in;
-      -moz-column-count: 3;
-      -moz-column-gap: 0;
+      column-count: 3;
+      column-gap: 0;
       border: silver 2pt;
       border-style: none solid;
     }
     #redline {
       width: 303pt;
       border-top: 8px solid red;
       margin-top: -1in;
       position: relative;
       z-index: -1;
     }
 
     .ocontainer {
       height: 0;
       position: relative;
-      -moz-column-count: 2;
-      -moz-column-gap: 0;
+      column-count: 2;
+      column-gap: 0;
     }
     .o1 { /* 3rd col */
       height: 10in;
     }
     .a1 { /* 1st col */
       position: absolute;
       height: 2in;
       width: 33pt;
--- a/layout/generic/crashtests/730559.html
+++ b/layout/generic/crashtests/730559.html
@@ -1,1 +1,1 @@
-<!DOCTYPE html><html style="height: 6523790304542em; width: 6207636626031em; box-sizing: border-box; border-style: dotted; -moz-column-width: 20px;"></html>
+<!DOCTYPE html><html style="height: 6523790304542em; width: 6207636626031em; box-sizing: border-box; border-style: dotted; column-width: 20px;"></html>
--- a/layout/generic/crashtests/734777.html
+++ b/layout/generic/crashtests/734777.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<body><div style="-moz-column-width: 1ch; font-family: monospace; width: 5ch;">X X &#x062A;</div></body>
+<body><div style="column-width: 1ch; font-family: monospace; width: 5ch;">X X &#x062A;</div></body>
--- a/layout/generic/crashtests/747688.html
+++ b/layout/generic/crashtests/747688.html
@@ -1,6 +1,6 @@
 <style>
-* { height: 0; margin: 100%; -moz-column-width: 50px; }
-.test1 { position: absolute; min-height: 100%; -moz-columns: 3; -moz-column-count: 200; }
+* { height: 0; margin: 100%; column-width: 50px; }
+.test1 { position: absolute; min-height: 100%; columns: 3; column-count: 200; }
 .test2 { padding-bottom: 100px; margin-bottom: 20px; width: 20px; }
 </style>
-<div class="test1"><figure><div class="test2">A0AAAA0A0AAAA00AAA<hgroup></hgroup><timer><optgroup></div><div class="test2"><rect><h5>
\ No newline at end of file
+<div class="test1"><figure><div class="test2">A0AAAA0A0AAAA00AAA<hgroup></hgroup><timer><optgroup></div><div class="test2"><rect><h5>
--- a/layout/generic/crashtests/750066-iframe.html
+++ b/layout/generic/crashtests/750066-iframe.html
@@ -1,10 +1,10 @@
-<html style="white-space: pre; -moz-column-count: 2;">
-<body onload="document.body.style.MozFloatEdge = 'margin-box';" style="-moz-column-width: 20em;">
+<html style="white-space: pre; column-count: 2;">
+<body onload="document.body.style.MozFloatEdge = 'margin-box';" style="column-width: 20em;">
 <div style="position: relative; height: 80px; margin: 10px;">
폋哟	
꠲	g

 C휤㏡Ⳣ꠰獧oق䰧	
 &amp;
 ꃎ	䅷ᩥ
 
 O禕v
 Eᚇ⋩XO	
@@ -24,9 +24,9 @@ 2ɻ	صkJP₾,cJ=
 
 a~ゲ	㯝A	ĝj

 
 ᭃ	&amp;羋劮૩k惖qs툩
	B䛊J=罩E
 
 <div style="position: absolute; height: 11px; top: 19px;"></div>
 </div>
-</body></html>
\ No newline at end of file
+</body></html>
--- a/layout/generic/crashtests/757413-2.html
+++ b/layout/generic/crashtests/757413-2.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
   <body onload="document.documentElement.offsetHeight; document.getElementById('x').style.position = 'relative';">
-    <div style="-moz-column-width: 200px; -moz-column-fill: auto; height: 200px;">
+    <div style="column-width: 200px; column-fill: auto; height: 200px;">
       <div style="height: 150px;"></div>
       <div style="float: left; height: 150px; width: 200px;"></div>
       <div>
         <div id="x" style="float: left; height: 150px; width: 200px;"></div>
       </div>
     </div>
   </body>
 </html>
--- a/layout/generic/crashtests/762902.html
+++ b/layout/generic/crashtests/762902.html
@@ -1,12 +1,12 @@
 <html><head>
 
 </head><body>
 
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
 mmmmmmm
 <div style="display: table;-moz-transform: translate(-50px);">
 <div style="position: fixed;">b t</div>
 </div>
 </div>
 
 </body></html>
--- a/layout/generic/crashtests/769120.html
+++ b/layout/generic/crashtests/769120.html
@@ -1,10 +1,10 @@
 <style>
-.c9::-moz-list-bullet, *|* { -moz-border-left-colors: ThreeDDarkShadow cornflowerblue; -moz-column-width: 400.816438698px;</style><source style="direction: ltr; font: 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999pt/375780pt Helvetica; margin: 14350em 65535em -65535; ">><style>body::first-letter {
+.c9::-moz-list-bullet, *|* { -moz-border-left-colors: ThreeDDarkShadow cornflowerblue; column-width: 400.816438698px;</style><source style="direction: ltr; font: 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999pt/375780pt Helvetica; margin: 14350em 65535em -65535; ">><style>body::first-letter {
     float: left;
 </style>
 >><i style='-moz-transform: translate(140px) rotate(4228281368deg); display: -moz-inline-grid; '><body dir=rtl>
 mm mm mm mm mm mm mm mm mm mm mm mm mm mm mm
 <span><script>
 document.body.offsetWidth;
 </script>
 
--- a/layout/generic/crashtests/777838.html
+++ b/layout/generic/crashtests/777838.html
@@ -1,13 +1,13 @@
 <html class="reftest-wait">
   <head>
     <style>
       #el0 {
-        -moz-column-count: 3; 
+        column-count: 3; 
         column-count: 3; 
         max-width: 13ex;
         display: inline-block;
       }
       #el0:first-line { font-family: x; }
       #el0:first-letter { float: right; }
     </style>
     <script>
--- a/layout/generic/crashtests/783228.html
+++ b/layout/generic/crashtests/783228.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
-<div style="-moz-columns: auto 28em; padding: 10px;">
+<div style="columns: auto 28em; padding: 10px;">
 <p>...</p>
 <div style="width: 400px;">
 <div style="float:left;">
 <img src="image.jpg"><br>.
 </div>
 </div>
 
 <div style="clear: both"></div><div style="width: 400px;"><div style="float:left;"><img src="image.jpg"><br>
--- a/layout/generic/crashtests/791601.xhtml
+++ b/layout/generic/crashtests/791601.xhtml
@@ -1,4 +1,4 @@
 <html xmlns="http://www.w3.org/1999/xhtml" style="white-space: pre-wrap; width: -moz-min-content; font-size: 4294967297px;" class="reftest-wait">
-<body style="font-size: 1px; -moz-column-count: 2;" onload="document.getElementById('p').style.paddingInlineStart = '4294967296px'; document.documentElement.offsetHeight; setTimeout(function(){document.documentElement.removeAttribute('class');},0); "> x
+<body style="font-size: 1px; column-count: 2;" onload="document.getElementById('p').style.paddingInlineStart = '4294967296px'; document.documentElement.offsetHeight; setTimeout(function(){document.documentElement.removeAttribute('class');},0); "> x
 
 y<div id="p"></div></body></html>
--- a/layout/generic/crashtests/810726-2.html
+++ b/layout/generic/crashtests/810726-2.html
@@ -9,17 +9,17 @@
       }
 
       p, ul, li {
         margin: 0;
         padding: 0;
         background-color: rgb(235, 235, 235);
       }
 
-      ul { -moz-column-count: 2;
+      ul { column-count: 2;
            background-color: rgb(255, 200, 200);
          }
 
       li { margin-left: 17px }
       .wrapper {
                 background-color: rgb(255, 0, 155); max-width: 910px;
                 border: 1px solid green;
                }
--- a/layout/generic/crashtests/812893.html
+++ b/layout/generic/crashtests/812893.html
@@ -7,9 +7,9 @@ div:not([autohide="true"]) {
     margin: 10px;
     padding-inline-end: 176em;
     }
 #one:not([type=image]) {
     font-size: 0.61em;
 </style>
 <body style="-moz-shape-inside: rectangle(53, 251, 25298px, 168); padding: 7 2319499247 7 -moz-calc(143px 179%); ">><form>R<kbd><footer><cell style="font-size-adjust: 18; ">_40ww Nq FI0[#  9*| kZf0. 8[7 0v]N=E4-T :es></footer></kbd><p hidden=true>>><div id=one>  H jk*Fk(s8{8q	F	bMIf T [  Kr~xP si%; z 	*jprB</div>
 >><length><hr style='wrap-padding: 238px; padding-bottom: 248px; '>>><description style="box-pack: start; border-style: inset; "><div><style>
-* { ruby-span: 2647821777; -moz-columns: 70 2px;>>
\ No newline at end of file
+* { ruby-span: 2647821777; columns: 70 2px;>>
--- a/layout/generic/crashtests/836895.html
+++ b/layout/generic/crashtests/836895.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html style="-moz-columns: 2 auto;">
+<html style="columns: 2 auto;">
 <head>
 <style>
 
 div { width:300px; background:yellow; height:50px; }
 
 </style>
 </head>
 
--- a/layout/generic/crashtests/837007.xhtml
+++ b/layout/generic/crashtests/837007.xhtml
@@ -1,9 +1,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <body>
 
-<div style="height: 15px; -moz-column-width: 50px;"><div style="white-space: pre; display: inline;">
+<div style="height: 15px; column-width: 50px;"><div style="white-space: pre; display: inline;">
 
 <input style="float: right;" /></div></div>
 
 </body>
 </html>
--- a/layout/generic/crashtests/840787.html
+++ b/layout/generic/crashtests/840787.html
@@ -8,11 +8,11 @@ function boom()
   document.documentElement.offsetHeight;
   document.getElementById("outer").lastChild.data = "Y";
   document.documentElement.offsetHeight;
 }
 
 </script>
 </head>
 <body onload="boom();">
-<div id="outer" style="-moz-column-width: 1px;"><div style="-moz-column-width: 1px;"><div style="height: 50px;"></div><div style="float: left; height: 466px;"></div><div></div></div>X</div>
+<div id="outer" style="column-width: 1px;"><div style="column-width: 1px;"><div style="height: 50px;"></div><div style="float: left; height: 466px;"></div><div></div></div>X</div>
 </body>
 </html>
--- a/layout/generic/crashtests/840818.html
+++ b/layout/generic/crashtests/840818.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <meta charset="UTF-8">
 </head>
 <body style="font-family: monospace;">
-<div style="-moz-column-count: 2;"><div style="-moz-column-count: 2; width: 9ch;">😎中文<span>; </span><span>!</span></div></div>
+<div style="column-count: 2;"><div style="column-count: 2; width: 9ch;">😎中文<span>; </span><span>!</span></div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/847130.xhtml
+++ b/layout/generic/crashtests/847130.xhtml
@@ -5,11 +5,11 @@
 function boom()
 {
   document.getElementById("x").appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "span"));
 }
 
 </script>
 </head>
 <body onload="boom();">
-<div style="-moz-column-count: 15;"><div style="-moz-column-count: 15;" id="x"><td style="display: block; height: 2.5em;"></td></div></div>
+<div style="column-count: 15;"><div style="column-count: 15;" id="x"><td style="display: block; height: 2.5em;"></td></div></div>
 </body>
 </html>
--- a/layout/generic/crashtests/849603.html
+++ b/layout/generic/crashtests/849603.html
@@ -4,17 +4,17 @@
 <style>
 
     .container {
       height: 24pt;
       position: relative;
     }
     #colset {
       height: 2in;
-      -moz-column-count: 3;
+      column-count: 3;
     }
     .c1 {
       position: absolute;
       height: 3in;
     }
     .c2 {
       position: absolute;
       height: 1in;
--- a/layout/generic/crashtests/850931.html
+++ b/layout/generic/crashtests/850931.html
@@ -12,21 +12,21 @@ m{K7G!|Uh	m!n#`vUu/Sk,g(C.oy&amp;WFxH|j
 3UxD*xOFV]cU!
 6
 ~qhDwQ
 BU
 <a><a href=abc.html id=test3>cone</a></h1>
 ><div class=refs id=test4><ul></div>
 
 >><p class="output expectedtext" id=test5><p id=test6><ul id=d><style>
-* { -moz-animation-name: cfpulse82; padding-left: 198pt; line-height: 35pc; -moz-columns: 215 131px; height: 287.422729301mm;</style><script>
+* { -moz-animation-name: cfpulse82; padding-left: 198pt; line-height: 35pc; columns: 215 131px; height: 287.422729301mm;</style><script>
 var docElement = document.body;
 document.addEventListener("DOMContentLoaded", CFcrash, false);
 function CFcrash() {
 try { test6.appendChild(test13); } catch(e) {}
 try { test5.appendChild(test1); } catch(e) {}
 try { docElement.insertBefore(test3, docElement.firstChild); } catch(e) {}
 try { test5.setAttribute("_clientheight", "26"); } catch(e) {}
 try { test6.setAttribute("class", "c35"); } catch(e) {}
 try { test6.textContent = "~R*#YfcG_69	u:lq~	3		5+	XM	h	6	-&C	/A_?	Kp-	 	*	j67n?i3$	^)6W O8ZHCE	A3GX!-O67nlX|Su		epvIL4		F	i|vr{X[3whHowuY"; } catch(e) {}
 document.documentElement.offsetTop;
 try { test3.lastChild.insertData("Ocz(3V	scv!*(-	yeZ1I Cr@1ki	e	T V?rA^?hER Ox? Mg!m| R!4cM	{Mo%3J	C DmO|v1#TV		JuWL UZ:", test5, "	1*$URv	=#7/	)~5v)cxO=9]:	bd@V]		M@5			@Hw	3gj	oLiV	9m9GF%W.b0	&	Hlu	@	0m@0%[?+mw#s|Z4;S%ziO"); } catch(e){}
-}</script>
\ No newline at end of file
+}</script>
--- a/layout/generic/crashtests/862185.html
+++ b/layout/generic/crashtests/862185.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <html><body>
-<div style="-moz-column-width: 1px;"><div style="backface-visibility: hidden; white-space: pre-wrap;"> <fieldset style="position: fixed;"><legend style="position: absolute;">
+<div style="column-width: 1px;"><div style="backface-visibility: hidden; white-space: pre-wrap;"> <fieldset style="position: fixed;"><legend style="position: absolute;">
  </legend></fieldset></div></div>
 </body></html>
--- a/layout/generic/crashtests/863935.html
+++ b/layout/generic/crashtests/863935.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
 <style id="ss">
 
 body { font-family: monospace; }
-.c { -moz-column-width: 1px; }
+.c { column-width: 1px; }
 .m { margin-bottom: 8px; }
 
 </style>
 <script>
 
 function boom()
 {
   document.documentElement.offsetHeight;
--- a/layout/generic/crashtests/914501.html
+++ b/layout/generic/crashtests/914501.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html class="multicol">
 <head>
 <meta charset="UTF-8">
 <style>
 
-.multicol { width: 300px; -moz-column-width: 100px; height: 100px; }
+.multicol { width: 300px; column-width: 100px; height: 100px; }
 .R { float:right; }
 .L { float: left; }
 .clear { clear: left; }
 
 </style>
 </head>
 
 <body><div class="L" style="height: 250px;"></div><div class="clear"></div><div style="margin-bottom: 1em;"></div><div class="L" style="height: 250px;"></div><div><div class="clear"><div class="R"></div></div></div></body>
--- a/layout/generic/crashtests/details-three-columns.html
+++ b/layout/generic/crashtests/details-three-columns.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <style>
   details {
-    -moz-column-count: 3;
-    -moz-column-rule: 1px solid lightgray;
+    column-count: 3;
+    column-rule: 1px solid lightgray;
     -webkit-column-count: 3;
     -webkit-column-rule: 1px solid lightgray;
     border: 1px solid lightblue;
   }
   summary {
     background-color: lightgreen;
   }
   </style>
--- a/layout/generic/crashtests/first-letter-638937-1.html
+++ b/layout/generic/crashtests/first-letter-638937-1.html
@@ -3,23 +3,23 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>yo-lobo</title>
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
     <meta content="werwolf - zoquete pluscuamperfecto" name="author" />
     <style type="text/css">
       body {
         font-family: sans-serif, Arial;
-        -moz-column-count: 5;
-        -moz-column-gap: 1em;
+        column-count: 5;
+        column-gap: 1em;
         padding: 5px;
       }
       body.crash {
-        -moz-column-rule-width: thin;
-        -moz-column-rule-style: solid;
+        column-rule-width: thin;
+        column-rule-style: solid;
       }
       p { 
         margin: 10px;
         padding: 0px;
       }
       p:first-letter { 
         font-size: 30pt;
         font-weight: bold;
--- a/layout/generic/crashtests/first-letter-638937-2.html
+++ b/layout/generic/crashtests/first-letter-638937-2.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html style="height: 600em; -moz-column-width: 1px;">
+<html style="height: 600em; column-width: 1px;">
 
 <head>
 <style>p::first-letter { float:left; }</style>
 </head>
 
 <body onload="x=document.body.parentNode; x.style.MozColumnWidth='111px'; x.offsetHeight; x.style.display='inline'; x.offsetHeight; "><p style="margin: -562949953421311em;">y
 </p><p>'</p></body>
 
--- a/layout/generic/crashtests/font-inflation-762332.html
+++ b/layout/generic/crashtests/font-inflation-762332.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<div style="-moz-column-width: 1px; font-family: monospace; width: 2ch;"><div style="position: relative;"><div style="position: absolute;">xxxxxxxxxxxxxx x xxxxxxx x xxxxxxxxxxxxxxxxxx x xxxxxxx x</div></div></div>
+<div style="column-width: 1px; font-family: monospace; width: 2ch;"><div style="position: relative;"><div style="position: absolute;">xxxxxxxxxxxxxx x xxxxxxx x xxxxxxxxxxxxxxxxxx x xxxxxxx x</div></div></div>
--- a/layout/generic/crashtests/text-overflow-bug670564.xhtml
+++ b/layout/generic/crashtests/text-overflow-bug670564.xhtml
@@ -1,3 +1,3 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="position: relative; white-space: pre-line; direction: rtl; top: -85967203400px; text-overflow: ellipsis; text-indent: 5242870ch; padding: 224652170px; overflow-y: scroll; -moz-column-width: 74804px; letter-spacing: 687194767px;">
+<html xmlns="http://www.w3.org/1999/xhtml" style="position: relative; white-space: pre-line; direction: rtl; top: -85967203400px; text-overflow: ellipsis; text-indent: 5242870ch; padding: 224652170px; overflow-y: scroll; column-width: 74804px; letter-spacing: 687194767px;">
 
 </html>
--- a/layout/generic/test/test_bug392923.html
+++ b/layout/generic/test/test_bug392923.html
@@ -2,17 +2,17 @@
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=392923
 -->
 <head>
   <title>Test for Bug 392923</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <style>p { -moz-column-count: 2; }
+  <style>p { column-count: 2; }
   </style>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=392923">Mozilla Bug 392923</a>
 <div id="content">
 <p>&#x5E2;&#x5D1;&#x5E8;&#x5D9;&#x5EA; Lorem ipsum dolor sit
 amet, consectetuer adipiscing elit. Maecenas volutpat. Duis purus lectus,
 hendrerit vitae, blandit ac, tristique quis, neque. Cras a nisl. Cum sociis
--- a/layout/generic/test/test_bug405178.html
+++ b/layout/generic/test/test_bug405178.html
@@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 405178</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=405178">Mozilla Bug 405178</a>
-<p id="display"><div id="div" style="-moz-column-width: 10px;">&#23377;&#1741; </div></p>
+<p id="display"><div id="div" style="column-width: 10px;">&#23377;&#1741; </div></p>
 <div id="content" style="display: none">
   
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Bug 405178 **/
 
--- a/layout/reftests/abs-pos/multi-column-1.html
+++ b/layout/reftests/abs-pos/multi-column-1.html
@@ -4,17 +4,17 @@
 <style type="text/css">
 div {
   color: #222;
   padding: 10px;
   border: 2px solid;
   position:relative;
 
   width:10em;
-  -moz-column-count:2;
+  column-count:2;
   -webkit-column-count:2;
 }
 
 h2, h3 {position:absolute; width:3em; background: #f00; color:#fff;}
 h2 { top: 0; left: 0; }
 h3 { bottom: 0; right: 0; }
 
 p, h2, h3 {margin:0;}
--- a/layout/reftests/bidi/unicode-bidi-isolate-basic-ref.html
+++ b/layout/reftests/bidi/unicode-bidi-isolate-basic-ref.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <script type="text/javascript" src="unicode-bidi-isolate-basic.js"></script>
 <style>
 .resultsDiv {
-    -moz-column-width: 3em;
+    column-width: 3em;
     -webkit-column-width: 3em;
-    -moz-column-gap: 5em;
+    column-gap: 5em;
     -webkit-column-gap: 5em;
     text-align: left;
 }
 .enclosed { display: inline-block; }
 </style>
 </head>
 <body onload="buildTable();">
 <div id="resultsContainer" style="position: relative">
--- a/layout/reftests/bidi/unicode-bidi-isolate-basic.html
+++ b/layout/reftests/bidi/unicode-bidi-isolate-basic.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <script type="text/javascript" src="unicode-bidi-isolate-basic.js"></script>
 <style>
 .resultsDiv {
-    -moz-column-width: 3em;
+    column-width: 3em;
     -webkit-column-width: 3em;
-    -moz-column-gap: 5em;
+    column-gap: 5em;
     -webkit-column-gap: 5em;
     text-align: left;
 }
 .enclosed { unicode-bidi: isolate; }
 </style>
 </head>
 <body onload="buildTable()">
 <div id="resultsContainer" style="position: relative">
--- a/layout/reftests/box-shadow/611574-1-ref.html
+++ b/layout/reftests/box-shadow/611574-1-ref.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <html><head><style>
 button,span,fieldset { background-color: #0F0; }
 </style></head>
 <body style="margin:30px">
-<div style="-moz-column-count:3">
+<div style="column-count:3">
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
--- a/layout/reftests/box-shadow/611574-1.html
+++ b/layout/reftests/box-shadow/611574-1.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <html><head><style>
 button,span,fieldset { background-color: #0F0; }
 </style></head>
 <body style="margin:30px">
-<div style="-moz-column-count:3;">
+<div style="column-count:3;">
 <p><button style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</button>
 
 <p><button style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</button>
--- a/layout/reftests/box-shadow/611574-2-ref.html
+++ b/layout/reftests/box-shadow/611574-2-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head><style>
 button,span,fieldset { border-radius: 7px 3px;  background-color: #0F0; }
 button { border: none; outline: 3px solid black; -moz-outline-radius: 7px 3px; outline-offset: -2px; }
 </style></head>
 <body style="margin:30px">
-<div style="-moz-column-count:3">
+<div style="column-count:3">
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 <p><button>No Blur Radius</button>
 
 <p><button>2px Blur Radius</button>
 <p><button>2px Blur Radius</button>
--- a/layout/reftests/box-shadow/611574-2.html
+++ b/layout/reftests/box-shadow/611574-2.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head><style>
 button,span,fieldset { border-radius: 7px 3px;  background-color: #0F0; }
 button { border: none; outline: 3px solid black; -moz-outline-radius: 7px 3px; outline-offset: -2px; }
 </style></head>
 <body style="margin:30px">
-<div style="-moz-column-count:3">
+<div style="column-count:3">
 <p><button style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</button>
 <p><button style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</button>
 
 <p><button style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</button>
 <p><button style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</button>
--- a/layout/reftests/bugs/243519-2-ref.html
+++ b/layout/reftests/bugs/243519-2-ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
-<body style="-moz-column-count:2; margin:0;">
+<body style="column-count:2; margin:0;">
 Hello<br>
 Kitty
 </body>
 </html>
--- a/layout/reftests/bugs/243519-2.html
+++ b/layout/reftests/bugs/243519-2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
-<html style="-moz-column-count:2;">
+<html style="column-count:2;">
 <body style="margin:0;">
 Hello<br>
 Kitty
 </body>
 </html>
--- a/layout/reftests/bugs/323656-3-ref.html
+++ b/layout/reftests/bugs/323656-3-ref.html
@@ -26,28 +26,28 @@
   </head>
   <body>
     <div class="t"><div></div></div>
     <span class="t"><div></div></span>
     <span style="position: relative" class="t"><div></div></span>
     <div class="f"><span></span><br><span></span></div>
     <button class="t"><div></div></button>
     <div style="overflow: auto" class="t"><div></div></div>
-    <div style="-moz-column-count: 2" class="t"><div></div></div>
+    <div style="column-count: 2" class="t"><div></div></div>
     <select size="2" class="t">
       <option></option>
     </select>
 
     <div class="t"><div></div></div>
     <span class="t"><div></div></span>
     <span style="position: relative" class="t"><div></div></span>
     <div class="f"><span></span><br><span></span></div>
     <button class="t"><div></div></button>
     <div style="overflow: auto" class="t"><div></div></div>
-    <div style="-moz-column-count: 2" class="t"><div></div></div>
+    <div style="column-count: 2" class="t"><div></div></div>
     <select size="2" class="t">
       <option></option>
     </select>
 
     <span class="t d2"><div></div><span></span></span>
     <span style="position: relative" class="t d2"><div></div><span></span></span>
   </body>
 </html>
--- a/layout/reftests/bugs/323656-3.html
+++ b/layout/reftests/bugs/323656-3.html
@@ -57,28 +57,28 @@
   </head>
   <body>
     <div class="t"><div></div></div>
     <span class="t"><div></div></span>
     <span style="position: relative" class="t"><div></div></span>
     <div class="f"><span></span><br><span></span></div>
     <button class="t"><div></div></button>
     <div style="overflow: auto" class="t"><div></div></div>
-    <div style="-moz-column-count: 2" class="t"><div></div></div>
+    <div style="column-count: 2" class="t"><div></div></div>
     <select size="2" class="t">
       <option></option>
     </select>
 
     <div class="t d"></div>
     <span class="t d"></span>
     <span style="position: relative" class="t d"></span>
     <div class="f d"></div>
     <button class="t d"></button>
     <div style="overflow: auto" class="t d"></div>
-    <div style="-moz-column-count: 2" class="t d"></div>
+    <div style="column-count: 2" class="t d"></div>
     <select size="2" class="t d">
       <option></option>
     </select>
 
     <span class="t d2"><div></div><span></span></span>
     <span style="position: relative" class="t d2"><div></div><span></span></span>
   </body>
 </html>
--- a/layout/reftests/bugs/368020-1-ref.html
+++ b/layout/reftests/bugs/368020-1-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
 <title>Testcase, bug 368020</title>
 </head>
 <body>
 
-<div style="-moz-column-count: 2; column-count: 2; -moz-column-fill: auto; height: 4.5em; background:yellow">
+<div style="column-count: 2; column-count: 2; column-fill: auto; height: 4.5em; background:yellow">
 
   <div style="margin: 7px 1% 2px 2em; border: medium dotted; border-width: 2px 3px 4px 5px;">
     <div style="background: url(repeatable-diagonal-gradient.png);">
       <div style="padding: 8px 6px 4px 2px;">
         blah<br>
         blah<br>
         blah<br>
         blah
--- a/layout/reftests/bugs/368020-1.html
+++ b/layout/reftests/bugs/368020-1.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
 <title>Testcase, bug 368020</title>
 </head>
 <body>
 
-<div style="-moz-column-count: 2; column-count: 2; -moz-column-fill: auto; height: 4.5em; background:yellow">
+<div style="column-count: 2; column-count: 2; column-fill: auto; height: 4.5em; background:yellow">
 
   <div>
     <div style="background: url(repeatable-diagonal-gradient.png); background-clip: padding-box; background-clip: padding; background-origin: padding-box; background-origin: padding; margin: 7px 1% 2px 2em; border: medium dotted; border-width: 2px 3px 4px 5px; padding: 8px 6px 4px 2px;">
       <div>
         blah<br>
         blah<br>
         blah<br>
         blah
--- a/layout/reftests/bugs/371043-1-ref.html
+++ b/layout/reftests/bugs/371043-1-ref.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <body>
-  <div id="source" style="font-size: 10px; -moz-column-gap: 2ch">
+  <div id="source" style="font-size: 10px; column-gap: 2ch">
     <span id="test"
           style="background: green; color: green; display: inline-block;
                  height: 30px; padding: 0 2px">00
     </span>
   </div>
 </body>
--- a/layout/reftests/bugs/371043-1.html
+++ b/layout/reftests/bugs/371043-1.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <body>
-  <div id="source" style="font-size: 10px; -moz-column-gap: 2ch">
+  <div id="source" style="font-size: 10px; column-gap: 2ch">
     <span id="test"
           style="background: green; display: inline-block; height: 30px;
                  padding: 0 2px">
     </span>
     <script>
       document.getElementById("test").style.width =
         document.defaultView.getComputedStyle(document.getElementById("source"),
                                               "").MozColumnGap;
--- a/layout/reftests/bugs/379349-1-ref.xhtml
+++ b/layout/reftests/bugs/379349-1-ref.xhtml
@@ -24,18 +24,18 @@
 
       font-size: 10pt;
       line-height: 10pt;
       color: blue;
     }
     body {
       height: 2in;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
+      column-width: 100pt;
+      column-gap: 0;
       position: relative;
       border: solid gray;
     }
   </style>
  </head>
  <body>
   <div id="container">
     <div id="overflow">
--- a/layout/reftests/bugs/379349-1a.xhtml
+++ b/layout/reftests/bugs/379349-1a.xhtml
@@ -24,18 +24,18 @@
 
       font-size: 10pt;
       line-height: 10pt;
       color: blue;
     }
     body {
       height: 2in;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
+      column-width: 100pt;
+      column-gap: 0;
       border: solid gray;
     }
   </style>
  </head>
  <body>
   <div id="container">
     <div id="overflow">
     </div>
--- a/layout/reftests/bugs/379349-1b.xhtml
+++ b/layout/reftests/bugs/379349-1b.xhtml
@@ -32,18 +32,18 @@
     }
     .no3 .overflow {
       height: 4.33333in;
       border-bottom-color: blue;
     }
     body {
       height: 2in;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
+      column-width: 100pt;
+      column-gap: 0;
       border: solid gray;
     }
   </style>
  </head>
  <body>
   <div class="container no1">
     <div class="overflow">
     </div>
--- a/layout/reftests/bugs/379349-1c.xhtml
+++ b/layout/reftests/bugs/379349-1c.xhtml
@@ -34,18 +34,18 @@
     .no3 .overflow {
       height: 4.33333in;
       position: relative;
       z-index: -1;
     }
     body {
       height: 2in;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
+      column-width: 100pt;
+      column-gap: 0;
       border: solid gray;
     }
   </style>
  </head>
  <body>
   <div class="container no1">
     <div class="overflow">
     </div>
--- a/layout/reftests/bugs/379349-2-ref.xhtml
+++ b/layout/reftests/bugs/379349-2-ref.xhtml
@@ -34,19 +34,19 @@
     .overflow {
       height: 4in;
       width: 200pt;
       border-bottom: 4px solid blue;
     }
     body {
       height: 2.5in;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 100pt;
+      column-gap: 0;
+      column-fill: auto;
       border: solid gray;
       position: relative;
     }
   </style>
  </head>
  <body>
   <div class="overflow">
   </div>
--- a/layout/reftests/bugs/379349-2a.xhtml
+++ b/layout/reftests/bugs/379349-2a.xhtml
@@ -41,19 +41,19 @@
     }
     .no4 .overflow {
       height: 800%;
       border-bottom-color: blue;
     }
     body {
       height: 2.5in;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 100pt;
+      column-gap: 0;
+      column-fill: auto;
       border: solid gray;
     }
   </style>
  </head>
  <body>
   <div class="container no1">
     <div class="overflow">
     </div>
--- a/layout/reftests/bugs/379349-2b.xhtml
+++ b/layout/reftests/bugs/379349-2b.xhtml
@@ -41,19 +41,19 @@
     }
     .no4 .overflow {
       height: 800%;
       border-bottom-color: blue;
     }
     body {
       height: 2.5in;
       width: 300pt;
-      -moz-column-width: 100pt;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 100pt;
+      column-gap: 0;
+      column-fill: auto;
       border: solid gray;
     }
   </style>
  </head>
  <body onload="document.getElementById('tester1').style.height = '9in';
                document.getElementById('tester1').offsetHeight;
                document.getElementById('tester2').style.height = '29in';
                document.getElementById('tester2').offsetHeight;
--- a/layout/reftests/bugs/386147-1-ref.html
+++ b/layout/reftests/bugs/386147-1-ref.html
@@ -1,6 +1,6 @@
-<div style="-moz-column-count: 2; width: 10em">
+<div style="column-count: 2; width: 10em">
 <div>
 a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>
 </div>
 <div>
 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
--- a/layout/reftests/bugs/386147-1.html
+++ b/layout/reftests/bugs/386147-1.html
@@ -1,6 +1,6 @@
-<div style="-moz-column-count: 2; width: 10em">
+<div style="column-count: 2; width: 10em">
 <div style="float:left;">
 a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>a<br>
 </div>
 <div style="float:left">
 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
--- a/layout/reftests/bugs/387876-1-ref.html
+++ b/layout/reftests/bugs/387876-1-ref.html
@@ -1,16 +1,16 @@
 <html>
 <head>
 <title>Bug 387876 Reference Case 1</title>
 </head>
 <body>
   The yellow box should say 'ab'.
-  <div style="-moz-column-width: 30px;
-              -moz-column-gap: 0px;
+  <div style="column-width: 30px;
+              column-gap: 0px;
               height: 0px;
              ">
     <div id="weirdDiv" 
          style="background: yellow;">ab</div>
     z
   </div>
 </body>
 </html>
--- a/layout/reftests/bugs/387876-1.html
+++ b/layout/reftests/bugs/387876-1.html
@@ -5,18 +5,18 @@
  function tweak() {
    document.getElementById('weirdDiv').textContent += 'b';
    document.documentElement.className = '';
  }
 </script>
 </head>
 <body onload="setTimeout(tweak, 10);">
   The yellow box should say 'ab'.
-  <div style="-moz-column-width: 30px;
-              -moz-column-gap: 0px;
+  <div style="column-width: 30px;
+              column-gap: 0px;
               height: 0px;
              ">
     <div id="weirdDiv" 
          style="background: yellow;">a</div>
     z
   </div>
 </body>
 </html>
--- a/layout/reftests/bugs/387876-2-ref.html
+++ b/layout/reftests/bugs/387876-2-ref.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <title>Bug 387876 Reference Case 2</title>
 </head>
 <body>
   <div style="width:100%; height:0px;
-              -moz-column-width: 20px; -moz-column-gap: 10px;">
+              column-width: 20px; column-gap: 10px;">
     <div style="background: lightblue;">a</div>
     <p id="weird" 
        style="background: lightgreen">b cd</p>
   </div>
 </body>
 </html>
--- a/layout/reftests/bugs/387876-2.html
+++ b/layout/reftests/bugs/387876-2.html
@@ -5,15 +5,15 @@
  function tweak() {
    document.getElementById('weird').textContent += 'd';
    document.documentElement.className = '';
  }
 </script>
 </head>
 <body onload="setTimeout(tweak, 10);">
   <div style="width:100%; height:0px;
-              -moz-column-width: 20px; -moz-column-gap: 10px;">
+              column-width: 20px; column-gap: 10px;">
     <div style="background: lightblue;">a</div>
     <p id="weird" 
        style="background: lightgreen">b c</p>
   </div>
 </body>
 </html>
--- a/layout/reftests/bugs/387876-3-ref.html
+++ b/layout/reftests/bugs/387876-3-ref.html
@@ -1,10 +1,10 @@
 <html>
 <body>
- <div style="-moz-column-width: 60px; height: 60px; background: yellow;">
+ <div style="column-width: 60px; height: 60px; background: yellow;">
    title
    <p id="p" style="background: lightgreen">
      below
    </p>
  </div>
 </body>
 </html>
--- a/layout/reftests/bugs/387876-3a.html
+++ b/layout/reftests/bugs/387876-3a.html
@@ -3,17 +3,17 @@
  <script>
   function tweak() {
     document.getElementById('p').textContent = 'below';
     document.documentElement.className = '';
   }
  </script>
 </head>
 <body onload="tweak()">
- <div style="-moz-column-width: 60px; height: 60px; background: yellow;">
+ <div style="column-width: 60px; height: 60px; background: yellow;">
    title
    <p id="p" style="background: lightgreen">
      line
      break
    </p>
  </div>
 </body>
 </html>
--- a/layout/reftests/bugs/387876-3b.html
+++ b/layout/reftests/bugs/387876-3b.html
@@ -3,17 +3,17 @@
  <script>
   function tweak() {
     document.getElementById('p').textContent = 'below';
     document.documentElement.className = '';
   }
  </script>
 </head>
 <body onload="tweak()">
- <div style="-moz-column-width: 60px; height: 60px; background: yellow;">
+ <div style="column-width: 60px; height: 60px; background: yellow;">
    title
    <p id="p" style="background: lightgreen">
      line
      break
      [middle]
      line
      break
      [middle]
--- a/layout/reftests/bugs/391979.html
+++ b/layout/reftests/bugs/391979.html
@@ -4,17 +4,17 @@
     <title>Testcase for bug 391979</title>
     <style type="text/css">
 
         html,body {
             color:black; background-color:white; font-size:16px; padding:0; margin:0;
         }
 	
         .float { float:left; clear:both; }
-        .t1 { -moz-column-count:2; -moz-column-width: 9ch; -moz-column-gap: 2ch; background:red; height:4ch; }
+        .t1 { column-count:2; column-width: 9ch; column-gap: 2ch; background:red; height:4ch; }
 
         .abs { position:absolute; width:20ch; height:4ch; }
 
         .red { background:red; }
         .green { background:green; }
     </style>
 </head>
 <body>
--- a/layout/reftests/bugs/393330-1-ref.html
+++ b/layout/reftests/bugs/393330-1-ref.html
@@ -2,18 +2,18 @@
 <html>
 <head>
 <style type="text/css">
   #div > div { text-indent: 0 }
   div > div > div { display: inline-block; width: 30px; }
   body > div > div { text-decoration: underline; }
 </style>
 <body>
-<div style="height: 20px; line-height: 20px; -moz-column-width: 100px;
-            -moz-column-gap: 0px">
+<div style="height: 20px; line-height: 20px; column-width: 100px;
+            column-gap: 0px">
 <div id="div" style="text-indent: 30px;">
   <div>a</div>
   <div>a</div>
 </div>
 <div>
   <div>a</div>
   <div>a</div>
   <div>a</div>
--- a/layout/reftests/bugs/393330-1.html
+++ b/layout/reftests/bugs/393330-1.html
@@ -8,18 +8,18 @@ function boom()
 }
 </script>
 <style type="text/css">
 #div > div { text-indent: 0; display: inline-block; width: 30px }
 </style>
 </head>
 <body onload="boom();">
 
-<div style="height: 20px; line-height: 20px; -moz-column-width: 100px;
-            -moz-column-gap: 0px">
+<div style="height: 20px; line-height: 20px; column-width: 100px;
+            column-gap: 0px">
 <div id="div" style="text-indent: 30px; text-decoration: underline;">
 <div>a</div>
 <div>a</div>
 <div>a</div>
 <div>a</div>
 <div>a</div>
 <div>a</div>
 <div>a</div>
--- a/layout/reftests/bugs/393649-1-ref.html
+++ b/layout/reftests/bugs/393649-1-ref.html
@@ -4,14 +4,14 @@
 function boom()
 {
   find("XXX");
 }
 </script>
 </head>
 
 <body onload="boom();" style="width: 15em;">
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
 <span id="span"><div>yo yo yo yo yo yo yo yo</div>XXX</span>
 </div>
 
 </body>
 </html>
--- a/layout/reftests/bugs/393649-1.html
+++ b/layout/reftests/bugs/393649-1.html
@@ -5,14 +5,14 @@ function boom()
 {
   document.getElementById("span").appendChild(document.createTextNode("XXX"));
   find("XXX");
 }
 </script>
 </head>
 
 <body onload="boom();" style="width: 15em;">
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
 <span id="span"><div>yo yo yo yo yo yo yo yo</div></span>
 </div>
 
 </body>
 </html>
--- a/layout/reftests/bugs/403134-1-ref.html
+++ b/layout/reftests/bugs/403134-1-ref.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <body>
 
-<div style="-moz-column-width: 0.5em; -moz-column-gap: 100px;" id="div"><span style="color: green">x</span>x ! </div>
+<div style="column-width: 0.5em; column-gap: 100px;" id="div"><span style="color: green">x</span>x ! </div>
   
 </body>
 </html>
--- a/layout/reftests/bugs/403134-1.html
+++ b/layout/reftests/bugs/403134-1.html
@@ -5,12 +5,12 @@
 
 #div:first-letter { color: green; }
 
 </style>
 </head>
 
 <body onload="document.getElementById('div').appendChild(document.createTextNode(''));">
 
-<div style="-moz-column-width: 0.5em; -moz-column-gap: 100px;" id="div">xx ! </div>
+<div style="column-width: 0.5em; column-gap: 100px;" id="div">xx ! </div>
   
 </body>
 </html>
--- a/layout/reftests/bugs/408493-1.html
+++ b/layout/reftests/bugs/408493-1.html
@@ -1,14 +1,14 @@
 <html>
 
 <head>
 <style type="text/css">
 
-body { -moz-column-count: 2; }
+body { column-count: 2; }
 span { white-space: pre; }
 body:first-letter { }
 
 </style>
 </head>
 
 <body onload="document.body.removeChild(document.body.lastChild);"><span>
 </span>b</body>
--- a/layout/reftests/bugs/408493-2-ref.html
+++ b/layout/reftests/bugs/408493-2-ref.html
@@ -1,14 +1,14 @@
 <html>
 
 <head>
 <style type="text/css">
 
-body { -moz-column-count: 2; }
+body { column-count: 2; }
 body:first-letter { color:blue; font-size:400%; }
 
 </style>
 </head>
 
 <body>T</body>
 
 </html>
--- a/layout/reftests/bugs/408493-2.html
+++ b/layout/reftests/bugs/408493-2.html
@@ -1,14 +1,14 @@
 <html>
 
 <head>
 <style type="text/css">
 
-body { -moz-column-count: 2; }
+body { column-count: 2; }
 span { white-space: pre; }
 body:first-letter { color:blue; font-size:400%; }
 
 </style>
 </head>
 
 <body onload="var span=document.getElementById('span'); span.removeChild(span.lastChild);"><span id="span">T
 </span>T</body>
--- a/layout/reftests/bugs/563584-6-columns.html
+++ b/layout/reftests/bugs/563584-6-columns.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML>
 <title>Testcase for float breaking</title>
-<body style="-moz-column-count: 2; -moz-column-gap: 0; margin: 0; width: 400px; height: 400px">
+<body style="column-count: 2; column-gap: 0; margin: 0; width: 400px; height: 400px">
 <!-- two columns, each 200px wide and 400px tall -->
   <div style="float: left; width: 150px; height: 100px; background: blue"></div>
   <div style="float: left; width: 75px; height: 200px; background: aqua"></div>
   <!-- test to see where this float goes -->
   <div style="float: left; width: 100px; height: 350px; background: fuchsia"></div>
 
--- a/layout/reftests/bugs/563584-9a.html
+++ b/layout/reftests/bugs/563584-9a.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <title>Test for pushing of floats to next column when float breaking in columns is disabled</title>
-<body style="-moz-column-width: 200px; margin: 0; -moz-column-gap: 0; height: 200px;">
+<body style="column-width: 200px; margin: 0; column-gap: 0; height: 200px;">
 <div style="float: left;">
   <div style="display: inline-block; vertical-align: top; height: 300px; width: 200px; background: yellow"></div>
 </div>
--- a/layout/reftests/bugs/563584-9b.html
+++ b/layout/reftests/bugs/563584-9b.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>Test for pushing of floats to next column when float breaking in columns is disabled</title>
-<body style="-moz-column-width: 200px; margin: 0; -moz-column-gap: 0; height: 200px;">
+<body style="column-width: 200px; margin: 0; column-gap: 0; height: 200px;">
 <div style="height: 10px"></div>
 <div style="float: left;">
   <div style="display: inline-block; vertical-align: top; height: 300px; width: 200px; background: yellow"></div>
 </div>
--- a/layout/reftests/bugs/563584-9c.html
+++ b/layout/reftests/bugs/563584-9c.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for pushing of floats to next column when float breaking in columns is disabled</title>
-<body style="-moz-column-width: 200px; -moz-column-fill: auto; margin: 0; -moz-column-gap: 0; height: 200px;">
+<body style="column-width: 200px; column-fill: auto; margin: 0; column-gap: 0; height: 200px;">
 <div style="float: left;">
   <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div>
 </div>
 <div style="float: left;">
   <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: aqua"></div>
 </div>
 <div style="float: left;">
   <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: fuchsia"></div>
--- a/layout/reftests/bugs/563584-9d.html
+++ b/layout/reftests/bugs/563584-9d.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for pushing of floats to next column when float breaking in columns is disabled</title>
-<body style="-moz-column-width: 200px; margin: 0; -moz-column-fill: auto; -moz-column-gap: 0; height: 200px;">
+<body style="column-width: 200px; margin: 0; column-fill: auto; column-gap: 0; height: 200px;">
 <div style="float: left;">
   <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div>
 </div>
 <div>&nbsp;</div>
 <div style="float: left;">
   <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: aqua"></div>
 </div>
 <div>&nbsp;</div>
--- a/layout/reftests/bugs/571281-1b.html
+++ b/layout/reftests/bugs/571281-1b.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html>
 <head>
 <style>
 li {
  list-style-position: inside;
- -moz-column-count: 2;
+ column-count: 2;
  column-count: 2;
 }
 </style>
 </head>
 <body>
 
 <ul>
  <li>Test (inside).</li>
--- a/layout/reftests/bugs/571281-1c.html
+++ b/layout/reftests/bugs/571281-1c.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html>
 <head>
 <style>
 li {
  list-style-position: inside;
- -moz-column-count: 2;
+ column-count: 2;
  column-count: 2;
  overflow: hidden;
 }
 </style>
 </head>
 <body>
 
 <ul>
--- a/layout/reftests/bugs/641856-1-ref.html
+++ b/layout/reftests/bugs/641856-1-ref.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html>
   <head>
     <style>
       p {
         background:gold;
 	width: 24em;
 
-	-moz-column-count: 2;
+	column-count: 2;
 	          columns: 2;
 
-	   -moz-column-rule: solid;
+	   column-rule: solid;
 	        column-rule: solid;
       }
     </style>
   </head>
   <body>
     <p>Some<br>text</p>
   </body>
 </html>
--- a/layout/reftests/bugs/641856-1.html
+++ b/layout/reftests/bugs/641856-1.html
@@ -2,20 +2,20 @@
 <html>
   <head>
     <style>
       p {
         background:gold;
 	width: 24em;
         overflow: hidden;
 
-	-moz-column-count: 2;
+	column-count: 2;
 	          columns: 2;
 
-	   -moz-column-rule: solid;
+	   column-rule: solid;
 	        column-rule: solid;
       }
     </style>
   </head>
   <body>
     <p>Some<br>text</p>
   </body>
 </html>
--- a/layout/reftests/bugs/696307-1.html
+++ b/layout/reftests/bugs/696307-1.html
@@ -1,4 +1,4 @@
 <!DOCTYPE HTML>
 <html><body>
-<div style="-moz-column-count:3; -moz-column-gap:0; width:600px;">X<div style="float:left; background:rgba(0,0,0,0.5);"><div style="position:absolute;">Y</div><span style="padding-left:210px;"></span></div></div>
+<div style="column-count:3; column-gap:0; width:600px;">X<div style="float:left; background:rgba(0,0,0,0.5);"><div style="position:absolute;">Y</div><span style="padding-left:210px;"></span></div></div>
 </body></html>
--- a/layout/reftests/bugs/722888-1-ref.html
+++ b/layout/reftests/bugs/722888-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
   <body>
-    <div style="-moz-column-count: 2;
+    <div style="column-count: 2;
                 height: 50px;
                 width: 100px;
                 background: yellow">
       a
     </div>
   </body>
 </html>
--- a/layout/reftests/bugs/722888-1.html
+++ b/layout/reftests/bugs/722888-1.html
@@ -6,16 +6,16 @@
         var b = document.getElementsByTagName("span")[0];
         b.parentNode.removeChild(b);
         document.documentElement.removeAttribute("class");
       }
       window.addEventListener("MozReftestInvalidate", tweak, false);
     </script>
   </head>
   <body>
-    <div style="-moz-column-count: 2;
+    <div style="column-count: 2;
                 height: 50px;
                 width: 100px;
                 background: yellow">
       <span>0 1 2 3 4 5 6 7 8 9 0</span>a
     </div>
   </body>
 </html>
--- a/layout/reftests/bugs/728983-1-ref.html
+++ b/layout/reftests/bugs/728983-1-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait">
 <body>
-<div style="-moz-column-count:2; column-count:2; width:300px; height:100px;">
+<div style="column-count:2; column-count:2; width:300px; height:100px;">
   <div id="o" style="opacity:0.5; width:100px; height:200px; background:lime;">
 	<div id="d" style="height:50px; width:80px; background:green; padding:2px">Text</div>
   </div>
 </div>
 <script>
 var o = document.getElementById("o");
 var d = document.getElementById("d");
 document.body.getBoundingClientRect();
--- a/layout/reftests/bugs/728983-1.html
+++ b/layout/reftests/bugs/728983-1.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait">
 <body>
-<div style="-moz-column-count:2; column-count:2; width:300px; height:100px;">
+<div style="column-count:2; column-count:2; width:300px; height:100px;">
   <div id="o" style="opacity:0.5; width:100px; height:200px; background:lime;">
 	<div id="d" style="height:50px; width:80px; background:red; padding:2px">Text</div>
   </div>
 </div>
 <script>
 var o = document.getElementById("o");
 var d = document.getElementById("d");
 document.body.getBoundingClientRect();
--- a/layout/reftests/bugs/751012-1b.html
+++ b/layout/reftests/bugs/751012-1b.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <body style="position: relative;">
-  <div style="-moz-column-count: 2; height: 300px">
+  <div style="column-count: 2; height: 300px">
     <div id="container" style="height: 600px">
       <!-- Make sure the abs-pos div's placeholder is not in the first continuation -->
       <div style="height: 400px"></div>
       <div style="position:absolute; top: 0; left: 0">
         <textarea rows="6">
         You should be seeing the "Should see me" text.
         a
         b
--- a/layout/reftests/bugs/921716-1-ref.html
+++ b/layout/reftests/bugs/921716-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <style>
 div {
-  -moz-column-count: 3;
-  -moz-column-gap: 8px;
+  column-count: 3;
+  column-gap: 8px;
   width: 300px;
 }
 </style>
 <div>
   <span>This is some content that is still shown within the columns.</span>
 </div>
--- a/layout/reftests/bugs/921716-1.html
+++ b/layout/reftests/bugs/921716-1.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <style>
 div {
-  -moz-column-count: 3;
-  -moz-column-gap: 8px;
-  -moz-column-rule: thick solid red;
+  column-count: 3;
+  column-gap: 8px;
+  column-rule: thick solid red;
   visibility: hidden;
   width: 300px;
   background-color: #fcc;
 }
 span {
   visibility: visible;
 }
 </style>
--- a/layout/reftests/columns/basic-1.html
+++ b/layout/reftests/columns/basic-1.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
   <style>
-  div { -moz-column-count:2; -moz-column-gap:0; }
+  div { column-count:2; column-gap:0; }
   </style>
 </head>
 <body>
   <div>
     Hello<br>
     Kitty
   </div>
 </body>
--- a/layout/reftests/columns/column-balancing-000.html
+++ b/layout/reftests/columns/column-balancing-000.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
 </style>
 
 
 
--- a/layout/reftests/columns/column-balancing-001.html
+++ b/layout/reftests/columns/column-balancing-001.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
 </style>
 
 
 
--- a/layout/reftests/columns/column-balancing-002.html
+++ b/layout/reftests/columns/column-balancing-002.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
 </style>
 
 
 
--- a/layout/reftests/columns/column-balancing-003.html
+++ b/layout/reftests/columns/column-balancing-003.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
 </style>
 
 
 
--- a/layout/reftests/columns/column-balancing-004.html
+++ b/layout/reftests/columns/column-balancing-004.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; min-height: 2em; }
 </style>
 
 
 
--- a/layout/reftests/columns/column-balancing-nested-000-ref.html
+++ b/layout/reftests/columns/column-balancing-nested-000-ref.html
@@ -8,29 +8,29 @@
   <title>Testing nested balancing column sets</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=822053">
 <style type="text/css">
         html,body {
             color:black; background-color:white; font-size:16px; padding:0; margin:0;
         }
 
   .colset {
-    -moz-column-count: 2;
-    -moz-column-gap: 1px;
-    -moz-column-rule: 1px solid black;
+    column-count: 2;
+    column-gap: 1px;
+    column-rule: 1px solid black;
     border: solid silver;
     margin-bottom:1em;
     width:30ch;
   }
   p { margin: 0; }
 
   /* balancing column sets deeper than level 2 should only use 1 column */
   .colset .colset .colset,
   .colset .colset .colset .colset {
-    -moz-column-count: 1;
+    column-count: 1;
   }
 </style>
 </head>
 <body>
 <div class="colset">
   <p>one one one one one</p>
   <div class="colset">
     <p>two two two two two</p>
--- a/layout/reftests/columns/column-balancing-nested-000.html
+++ b/layout/reftests/columns/column-balancing-nested-000.html
@@ -8,19 +8,19 @@
   <title>Testing nested balancing column sets</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=822053">
 <style type="text/css">
         html,body {
             color:black; background-color:white; font-size:16px; padding:0; margin:0;
         }
 
   .colset {
-    -moz-column-count: 2;
-    -moz-column-gap: 1px;
-    -moz-column-rule: 1px solid black;
+    column-count: 2;
+    column-gap: 1px;
+    column-rule: 1px solid black;
     border: solid silver;
     margin-bottom:1em;
     width:30ch;
   }
   p { margin: 0; }
 </style>
 </head>
 <body>
--- a/layout/reftests/columns/column-balancing-nested-001-ref.html
+++ b/layout/reftests/columns/column-balancing-nested-001-ref.html
@@ -8,37 +8,37 @@
   <title>Testing nested balancing column sets</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=822053">
 <style type="text/css">
         html,body {
             color:black; background-color:white; font-family:monospace; font-size:16px; padding:0; margin:0;
         }
 
   .colset {
-    -moz-column-count: 2;
-    -moz-column-gap: 0px;
-    -moz-column-rule: 1px solid black;
+    column-count: 2;
+    column-gap: 0px;
+    column-rule: 1px solid black;
     margin-bottom:1em;
     width:30ch;
   }
   .colset.lvl2 {
-    -moz-column-rule: 1px solid blue;
+    column-rule: 1px solid blue;
   }
   .colset.lvl3 {
-    -moz-column-rule: 1px solid red;
+    column-rule: 1px solid red;
   }
   p { margin: 0; }
   .non-balancing {
-    -moz-column-count: 1;
+    column-count: 1;
   }
   .fixed-height.lvl2 {
-    -moz-column-count: 2;
+    column-count: 2;
   }
   .fixed-height {
-    -moz-column-count: 1;
+    column-count: 1;
     height:3em;
   }
 </style>
 </head>
 <body>
 <div class="colset">
   <p>one one one one one</p>
   <div class="colset non-balancing lvl2">
--- a/layout/reftests/columns/column-balancing-nested-001.html
+++ b/layout/reftests/columns/column-balancing-nested-001.html
@@ -8,31 +8,31 @@
   <title>Testing nested balancing column sets</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=822053">
 <style type="text/css">
         html,body {
             color:black; background-color:white; font-family:monospace; font-size:16px; padding:0; margin:0;
         }
 
   .colset {
-    -moz-column-count: 2;
-    -moz-column-gap: 0px;
-    -moz-column-rule: 1px solid black;
+    column-count: 2;
+    column-gap: 0px;
+    column-rule: 1px solid black;
     margin-bottom:1em;
     width:30ch;
   }
   .colset.lvl2 {
-    -moz-column-rule: 1px solid blue;
+    column-rule: 1px solid blue;
   }
   .colset.lvl3 {
-    -moz-column-rule: 1px solid red;
+    column-rule: 1px solid red;
   }
   p { margin: 0; }
   .non-balancing {
-    -moz-column-fill: auto;
+    column-fill: auto;
   }
   .fixed-height {
     height:3em;
   }
 </style>
 </head>
 <body>
 <div class="colset">
--- a/layout/reftests/columns/column-balancing-overflow-000.html
+++ b/layout/reftests/columns/column-balancing-overflow-000.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
   .short { height: 5px; }
 </style>
 
 
--- a/layout/reftests/columns/column-balancing-overflow-000.ref.html
+++ b/layout/reftests/columns/column-balancing-overflow-000.ref.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
 </style>
 
 
 
--- a/layout/reftests/columns/column-balancing-overflow-001.html
+++ b/layout/reftests/columns/column-balancing-overflow-001.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
   .short { height: 5px; }
 </style>
 
 
--- a/layout/reftests/columns/column-balancing-overflow-002.html
+++ b/layout/reftests/columns/column-balancing-overflow-002.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
   .short { height: 5px; }
   .table { display: table; }
 </style>
 
--- a/layout/reftests/columns/column-balancing-overflow-003.html
+++ b/layout/reftests/columns/column-balancing-overflow-003.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   .short { height: 5px; }
   img { display: block;
         width: 3em;
         height: 3em;}
 </style>
--- a/layout/reftests/columns/column-balancing-overflow-003.ref.html
+++ b/layout/reftests/columns/column-balancing-overflow-003.ref.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <title>Balancing Overflow</title>
 
 <style type="text/css">
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   img { display: block;
         width: 3em;
         height: 3em;}
 </style>
 
--- a/layout/reftests/columns/column-balancing-overflow-004.html
+++ b/layout/reftests/columns/column-balancing-overflow-004.html
@@ -4,22 +4,22 @@
     100px/50px/51+px
     100px/30px/74+px
    Get only an assert unless you set ".d { position: absolute; }".
    
    Trigger hang (separate issue, absolute not needed):
     10px/10px/9999px
     10px/10px/999999px --> "bad height" notreached
 */
-/* Note: The -moz-column-gap and the backgrounds 
+/* Note: The column-gap and the backgrounds 
    are just added here for easier visualization */
 #colset { width: 200px;
           padding: 2px;
-          -moz-column-count: 3;
-          -moz-column-gap: 2px; }
+          column-count: 3;
+          column-gap: 2px; }
 #a      { height: 100px;   background: lightblue;}
 #b      { height:  50px;   background: lightgreen;}
 #c      { height:  51px;   background: orange;}
 
 </style>
 <script>
   function boom() {
     document.getElementById('colset').offsetHeight;
--- a/layout/reftests/columns/column-balancing-overflow-005.html
+++ b/layout/reftests/columns/column-balancing-overflow-005.html
@@ -1,13 +1,13 @@
 <html><head>
 <style>
 #colset { width: 200px;
-          -moz-column-count: 3;
-          -moz-column-gap: 4px;
+          column-count: 3;
+          column-gap: 4px;
           padding: 4px;
 	  outline: 1px orange solid; }
 #b      { height: 12px;         
           outline: 1px green dotted;}
 #c      { height: 13px;
           background: yellow;}
 </style></head><body><div id="colset"><div id="b"><div id="c"></div></div></div>
-</body></html>
\ No newline at end of file
+</body></html>
--- a/layout/reftests/columns/column-box-alignment-rtl.html
+++ b/layout/reftests/columns/column-box-alignment-rtl.html
@@ -2,19 +2,19 @@
 <style>
 * {
     margin: 0 0;
     padding: 0 0;
 }
 
 div {
     column-gap: 0;
-    -moz-column-gap: 0;
+    column-gap: 0;
     column-count: 4;
-    -moz-column-count: 4;
+    column-count: 4;
     -webkit-column-count: 4;
     -o-column-count: 4;
     -ms-column-count: 4;
 }
 
 /* cosmetics */
 div {
     border: 1px solid;
--- a/layout/reftests/columns/columnfill-auto-2-ref.html
+++ b/layout/reftests/columns/columnfill-auto-2-ref.html
@@ -17,19 +17,19 @@
     padding: 5px 0px 0px 10px;
     position: absolute;
     left: 500px;
     right: 0px;
     top: 0px;
     bottom: 0px;
     background-color: orange;
     height: 120px;
-    -moz-column-width: 640px;
-    -moz-column-fill: balance;
-    -moz-column-gap: 0;
+    column-width: 640px;
+    column-fill: balance;
+    column-gap: 0;
     overflow-x: auto;
     overflow-y: hidden;
   }
 
   #parent {
     background-color: lightBlue;
     position: absolute;
     left: 0px;
--- a/layout/reftests/columns/columnfill-auto-2.html
+++ b/layout/reftests/columns/columnfill-auto-2.html
@@ -17,19 +17,19 @@
     padding: 5px 0px 0px 10px;
     position: absolute;
     left: 500px;
     right: 0px;
     top: 0px;
     bottom: 0px;
     background-color: orange;
     height: 120px;
-    -moz-column-width: 640px;
-    -moz-column-fill: auto;
-    -moz-column-gap: 0;
+    column-width: 640px;
+    column-fill: auto;
+    column-gap: 0;
     overflow-x: auto;
     overflow-y: hidden;
   }
 
   #parent {
     background-color: lightBlue;
     position: absolute;
     left: 0px;
--- a/layout/reftests/columns/columnfill-auto-3.html
+++ b/layout/reftests/columns/columnfill-auto-3.html
@@ -16,19 +16,19 @@
   #test {
     padding: 5px 0px 0px 10px;
     position: absolute;
     left: 500px;
     right: 0px;
     top: 0px;
     background-color: orange;
     max-height: 120px;
-    -moz-column-width: 640px;
-    -moz-column-fill: auto;
-    -moz-column-gap: 0;
+    column-width: 640px;
+    column-fill: auto;
+    column-gap: 0;
     overflow-x: auto;
     overflow-y: hidden;
   }
 
   #parent {
     background-color: lightBlue;
     position: absolute;
     left: 0px;
--- a/layout/reftests/columns/columnfill-auto.html
+++ b/layout/reftests/columns/columnfill-auto.html
@@ -10,19 +10,19 @@ mask {
   top:0; bottom:0; left:8px; width:5px;
   background: black;
 }
 
 .rel {
   position: relative;
 }
 .columns {
-  -moz-column-width: 12em;
-  -moz-column-gap: 0;
-  -moz-column-fill: auto;
+  column-width: 12em;
+  column-gap: 0;
+  column-fill: auto;
   height: 8em;
   font-family: ahem;
   font-size: 12pt;
   line-height: 1.1;
 }
 a {
   position: absolute;
   width: 10px;
--- a/layout/reftests/columns/columnfill-balance.html
+++ b/layout/reftests/columns/columnfill-balance.html
@@ -1,16 +1,16 @@
 <html>
   <head>
       <link rel="stylesheet" type="text/css" href="ahem.css" />
   </head>
   <body>
-    <div style="-moz-column-width: 200px;
-                -moz-column-gap: 0px;
-                -moz-column-fill: balance;
+    <div style="column-width: 200px;
+                column-gap: 0px;
+                column-fill: balance;
                 height: 150px;
                 margin-bottom: 0;
                 padding-bottom: 0;
                 font-family: ahem;">
       Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
     </div>
   </body>
 </html>
--- a/layout/reftests/columns/columnfill-overflow-ref.html
+++ b/layout/reftests/columns/columnfill-overflow-ref.html
@@ -11,20 +11,20 @@
         height: 5em;
         overflow: visible;
 
         column-width:15em;
         column-gap: 2em;
         column-rule: 4px solid green;
         column-fill: auto;
 
-        -moz-column-width:15em;
-        -moz-column-gap: 2em;
-        -moz-column-rule: 4px solid green;
-        -moz-column-fill: auto;
+        column-width:15em;
+        column-gap: 2em;
+        column-rule: 4px solid green;
+        column-fill: auto;
 
         padding: 5px;
       }
 
       p {
         margin: 0;
         padding: 0
       }
--- a/layout/reftests/columns/columnfill-overflow.html
+++ b/layout/reftests/columns/columnfill-overflow.html
@@ -11,20 +11,20 @@
         height: 5em;
         overflow: visible;
 
         column-width:15em;
         column-gap: 2em;
         column-rule: 4px solid green;
         column-fill: balance;
 
-        -moz-column-width:15em;
-        -moz-column-gap: 2em;
-        -moz-column-rule: 4px solid green;
-        -moz-column-fill: balance;
+        column-width:15em;
+        column-gap: 2em;
+        column-rule: 4px solid green;
+        column-fill: balance;
 
         padding: 5px;
       }
 
       p {
         margin: 0;
         padding: 0
       }
--- a/layout/reftests/columns/columnrule-basic-ref.html
+++ b/layout/reftests/columns/columnrule-basic-ref.html
@@ -1,15 +1,15 @@
 <div style="position: absolute;
   top: 20px; left: 517px;
   width: 6px;
   background-color: red;
   height: 100px;"></div>
 <div style="position: absolute;
   top: 20px; left: 20px;
-  -moz-column-count:2;
-  -moz-column-gap: 0px;">
+  column-count:2;
+  column-gap: 0px;">
 <div style="height:200px;
   width: 500px;
   font-size: 16px;">
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
 </div>
 </div>
--- a/layout/reftests/columns/columnrule-basic.html
+++ b/layout/reftests/columns/columnrule-basic.html
@@ -1,11 +1,11 @@
 <div style="position: absolute;
   top: 20px; left: 20px;
-  -moz-column-count :2;
-  -moz-column-gap: 0px;
-  -moz-column-rule: 6px red solid;">
+  column-count :2;
+  column-gap: 0px;
+  column-rule: 6px red solid;">
 <div style="height:200px;
   width: 500px;
   font-size: 16px;">
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
 </div>
 </div>
--- a/layout/reftests/columns/columnrule-complex-ref.html
+++ b/layout/reftests/columns/columnrule-complex-ref.html
@@ -12,16 +12,16 @@
 <div style="position: absolute;
   top: 20px; left: 917px;
   width: 6px;
   background-color: red;
   height: 100px;">
 </div>
 <div style="position: absolute;
   top: 20px; left: 20px;
-  -moz-column-count: 4;
-  -moz-column-gap: 0px;">
+  column-count: 4;
+  column-gap: 0px;">
 <div style="height:400px;
   width: 300px;
   font-size: 16px;">
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
 </div>
 </div>
--- a/layout/reftests/columns/columnrule-complex.html
+++ b/layout/reftests/columns/columnrule-complex.html
@@ -1,11 +1,11 @@
 <div style="position: absolute;
   top: 20px; left: 20px;
-  -moz-column-count: 4;
-  -moz-column-gap: 0px;
-  -moz-column-rule: 6px red solid;
+  column-count: 4;
+  column-gap: 0px;
+  column-rule: 6px red solid;
   font-size: 16px;">
 <div style="height:400px;
   width: 300px;">
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
 </div>
 </div>
--- a/layout/reftests/columns/columnrule-linestyles-notref.html
+++ b/layout/reftests/columns/columnrule-linestyles-notref.html
@@ -1,1 +1,1 @@
-<div style="-moz-column-count:2; -moz-column-gap: 3px; -moz-column-rule: 6px red solid;"><div style="height:100px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.</div></div>
+<div style="column-count:2; column-gap: 3px; column-rule: 6px red solid;"><div style="height:100px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.</div></div>
--- a/layout/reftests/columns/columnrule-linestyles.html
+++ b/layout/reftests/columns/columnrule-linestyles.html
@@ -1,2 +1,2 @@
 <!-- Make sure no-one regresses line styles on column rules -->
-<div style="-moz-column-count:2; -moz-column-gap: 3px; -moz-column-rule: 6px red dotted;"><div style="height:100px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.</div></div>
+<div style="column-count:2; column-gap: 3px; column-rule: 6px red dotted;"><div style="height:100px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.</div></div>
--- a/layout/reftests/columns/columnrule-overflow.html
+++ b/layout/reftests/columns/columnrule-overflow.html
@@ -24,18 +24,18 @@
       height: 875px;
       background: blue;
     }
 
     div.multicolumn {
         height: 175px;
         overflow: visible;
 
-        -moz-column-width: 180px;
-        -moz-column-gap: 10px;
-        -moz-column-rule: 10px solid green;
+        column-width: 180px;
+        column-gap: 10px;
+        column-rule: 10px solid green;
     }
     </style>
   </head>
   <body>
     <div class="multicolumn"><div class="content"></div></div>
   </body>
 </html>
--- a/layout/reftests/columns/columnrule-padding-ref.html
+++ b/layout/reftests/columns/columnrule-padding-ref.html
@@ -15,17 +15,17 @@
   top: 40px; left: 937px;
   width: 6px;
   background-color: green;
   height: 100px;">
 </div>
 <div style="position: absolute;
   top: 40px; left: 40px;
   height: 100px;
-  -moz-column-count: 4;
-  -moz-column-gap: 0px;">
+  column-count: 4;
+  column-gap: 0px;">
 <div style="height:400px;
   width: 300px;
   font-size: 16px;">
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
 </div>
 </div>
 </body>
--- a/layout/reftests/columns/columnrule-padding.html
+++ b/layout/reftests/columns/columnrule-padding.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <body style="overflow:hidden">
 <div style="padding: 20px;
   position: absolute;
   top: 20px; left: 20px;
-  -moz-column-count: 4;
-  -moz-column-gap: 0px;
-  -moz-column-rule: 6px green solid;">
+  column-count: 4;
+  column-gap: 0px;
+  column-rule: 6px green solid;">
 <div style="height:400px;
   width: 300px;
   font-size: 16px;">
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
 </div>
 </div>
 </body>
--- a/layout/reftests/columns/columns-table-caption-000-ref.html
+++ b/layout/reftests/columns/columns-table-caption-000-ref.html
@@ -10,47 +10,47 @@
     <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1109571">
     <style type="text/css">
 
 * {
     color:black; background:none; font-size:16px; padding:0; margin:0; font-family:monospace;
 }
 
 .caption {
-  -moz-column-count:2;
+  column-count:2;
   -webkit-column-count:2;
   -o-column-count:2;
   -ms-column-count:2;
   column-count:2;
 
-  -moz-column-rule:2px solid blue;
+  column-rule:2px solid blue;
   -webkit-column-rule:2px solid blue;
   -o-column-rule:2px solid blue;
   -ms-column-rule:2px solid blue;
   column-rule:2px solid blue;
 
-  -moz-column-gap:10px;
+  column-gap:10px;
   -webkit-column-gap:10px;
   -o-column-gap:10px;
   -ms-column-gap:10px;
   column-gap:10px;
 
   height:2.2em;
   line-height:1em;
   border:2px dotted;
 }
 .col1 {
-  -moz-column-count:1;
+  column-count:1;
   -webkit-column-count:1;
   -o-column-count:1;
   -ms-column-count:1;
   column-count:1;
 }
 .cw1 {
-  -moz-column-width:1px;
+  column-width:1px;
   -webkit-column-width:1px;
   -o-column-width:1px;
   -ms-column-width:1px;
   column-width:1px;
 }
 table {border:1px solid black}
 .wrap { float:left; clear:both; outline:1px dashed lime; margin-top:3px; }
     </style>
--- a/layout/reftests/columns/columns-table-caption-000.html
+++ b/layout/reftests/columns/columns-table-caption-000.html
@@ -11,47 +11,47 @@
     <link rel="match" href="columns-table-caption-000-ref.html">
     <style type="text/css">
 
 * {
     color:black; background:none; font-size:16px; padding:0; margin:0; font-family:monospace;
 }
 
 caption {
-  -moz-column-count:2;
+  column-count:2;
   -webkit-column-count:2;
   -o-column-count:2;
   -ms-column-count:2;
   column-count:2;
 
-  -moz-column-rule:2px solid blue;
+  column-rule:2px solid blue;
   -webkit-column-rule:2px solid blue;
   -o-column-rule:2px solid blue;
   -ms-column-rule:2px solid blue;
   column-rule:2px solid blue;
 
-  -moz-column-gap:10px;
+  column-gap:10px;
   -webkit-column-gap:10px;
   -o-column-gap:10px;
   -ms-column-gap:10px;
   column-gap:10px;
 
   height:2.2em;
   line-height:1em;
   border:2px dotted;
 }
 .col1 {
-  -moz-column-count:1;
+  column-count:1;
   -webkit-column-count:1;
   -o-column-count:1;
   -ms-column-count:1;
   column-count:1;
 }
 .cw1 {
-  -moz-column-width:1px;
+  column-width:1px;
   -webkit-column-width:1px;
   -o-column-width:1px;
   -ms-column-width:1px;
   column-width:1px;
 }
 table {border:1px solid black}
 .wrap { float:left; clear:both; outline:1px dashed lime; margin-top:3px; }
     </style>
--- a/layout/reftests/columns/fieldset-columns-001-ref.html
+++ b/layout/reftests/columns/fieldset-columns-001-ref.html
@@ -14,29 +14,29 @@ f {
   position: fixed;
   width: 10px;
   height: 10px;
   bottom: 0;
   left: 100px;
   background: lime;
 }
 fieldset div {
-  -moz-columns: 2;
-  -moz-column-fill: auto;
+  columns: 2;
+  column-fill: auto;
 }
 fieldset {
   border: 1px solid;
 }
 .rel {
   position: relative;
 }
 </style>
 <fieldset style="overflow:hidden; width:300px; height:200px;">
   <legend>Legend</legend>
-<div class="rel" style="-moz-columns: 2; width:100%; height:100%;">
+<div class="rel" style="columns: 2; width:100%; height:100%;">
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
@@ -48,17 +48,17 @@ fieldset {
   <p>X
   <p>X
   <p>X
 <a></a><f></f>
 </div>
 </fieldset>
 <fieldset style="width:600px; height:7em; overflow:hidden">
   <legend>Legend</legend>
-<div class="rel" style="-moz-columns: 3; -moz-column-gap:2em; -moz-column-rule:3px solid; -moz-column-width:3em; width:100%; height:100%">
+<div class="rel" style="columns: 3; column-gap:2em; column-rule:3px solid; column-width:3em; width:100%; height:100%">
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
 <a></a><f style="left:120px"></f>
 </div>
--- a/layout/reftests/columns/fieldset-columns-001.html
+++ b/layout/reftests/columns/fieldset-columns-001.html
@@ -14,18 +14,18 @@ f {
   position: fixed;
   width: 10px;
   height: 10px;
   bottom: 0;
   left: 100px;
   background: lime;
 }
 fieldset {
-  -moz-columns: 2;
-  -moz-column-fill: auto;
+  columns: 2;
+  column-fill: auto;
   border: 1px solid;
 }
 .rel {
   position: relative;
 }
 </style>
 <fieldset class="rel" style="overflow:hidden; width:300px; height:200px;">
   <legend>Legend</legend>
@@ -42,17 +42,17 @@ fieldset {
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
 <a></a><f></f>
 </fieldset>
-<fieldset class="rel" style="-moz-columns: 3; -moz-column-gap:2em; -moz-column-rule:3px solid; -moz-column-width:3em; width:600px; height:7em">
+<fieldset class="rel" style="columns: 3; column-gap:2em; column-rule:3px solid; column-width:3em; width:600px; height:7em">
   <legend>Legend</legend>
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
   <p>X
 <a></a><f style="left:120px"></f>
--- a/layout/reftests/columns/margin-collapsing-bug616722-1-ref.html
+++ b/layout/reftests/columns/margin-collapsing-bug616722-1-ref.html
@@ -3,17 +3,17 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<title>616722-1</title>
 
 	<style type="text/css">
                 body,html { margin:0;padding: 10px;}
                 p  { margin: 0; background:pink; }
 		.columns {
 			-webkit-column-count: 1;
-			-moz-column-count: 1;
+			column-count: 1;
 			column-count: 1;
                         background-color:lime;
 			margin: 0em;
 			border: 1px solid black;
 		}
 		.no-border {
 			border-width:0;
 		}
--- a/layout/reftests/columns/margin-collapsing-bug616722-1.html
+++ b/layout/reftests/columns/margin-collapsing-bug616722-1.html
@@ -12,17 +12,17 @@
 			border: 1px solid black;
 		}
 		.no-border {
 			border-style: none;
 		}
 
 		.columns {
 			-webkit-column-count: 1;
-			-moz-column-count: 1;
+			column-count: 1;
 			column-count: 1;
 		}
 	</style>
 </head>
 <body>
 		<div class="columns">
 			<p style="margin-top:10px">The quick brown fox jumps over the lazy dog.</p>
 		</div>
--- a/layout/reftests/columns/margin-collapsing-bug616722-2-ref.html
+++ b/layout/reftests/columns/margin-collapsing-bug616722-2-ref.html
@@ -5,17 +5,17 @@
 
 	<style type="text/css">
                 body,html { margin:0;padding: 10px;}
                 p  { margin: 3px 0; background:pink; }
                 .no-border p  { margin: 0; }
 
 		.columns {
 			-webkit-column-count: 3;
-			-moz-column-count: 3;
+			column-count: 3;
 			column-count: 3;
                         background-color:lime;
 			margin: 0em;
 			border: 1px solid black;
 		}
 		.no-border {
 			border-width: 0;
 		}
--- a/layout/reftests/columns/margin-collapsing-bug616722-2.html
+++ b/layout/reftests/columns/margin-collapsing-bug616722-2.html
@@ -12,17 +12,17 @@
 			border: 1px solid black;
 		}
 		.no-border {
 			border-style: none;
 		}
 
 		.columns {
 			-webkit-column-count: 3;
-			-moz-column-count: 3;
+			column-count: 3;
 			column-count: 3;
 		}
 	</style>
 </head>
 <body>
 		<div class="columns no-border" style="margin:10px 0"></div>
 		<div class="columns">
 			<p style="margin-top:10px">1</p>
--- a/layout/reftests/columns/min-width-1a.html
+++ b/layout/reftests/columns/min-width-1a.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <style>
-  div { -moz-column-count:2; -moz-column-gap:0; border:2px solid black; height:200px; }
-  div.gap { -moz-column-gap:80px; }
+  div { column-count:2; column-gap:0; border:2px solid black; height:200px; }
+  div.gap { column-gap:80px; }
   span { display:inline-block; width:100px; }
   </style>
 </head>
 <body>
   <table cellpadding=0 cellspacing=0 width="1"><tr><td><div>
     <span></span>
   </div></tr></td></table>
   <table cellpadding=0 cellspacing=0 width="1"><tr><td><div class="gap">
--- a/layout/reftests/columns/min-width-1b.html
+++ b/layout/reftests/columns/min-width-1b.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <style>
-  div { -moz-column-width:200px; -moz-column-count:2; -moz-column-gap:0; border:2px solid black; height:200px; }
-  div.gap { -moz-column-gap:80px; }
+  div { column-width:200px; column-count:2; column-gap:0; border:2px solid black; height:200px; }
+  div.gap { column-gap:80px; }
   span { display:inline-block; width:100px; }
   </style>
 </head>
 <body>
   <table width="1"><tr><td><div>
     <span></span>
   </div></tr></td></table>
   <table width="1"><tr><td><div class="gap">
--- a/layout/reftests/columns/min-width-1c.html
+++ b/layout/reftests/columns/min-width-1c.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <style>
-  div { -moz-column-width:100px; -moz-column-count:2; -moz-column-gap:0; border:2px solid black; height:200px; }
-  div.gap { -moz-column-gap:80px; }
+  div { column-width:100px; column-count:2; column-gap:0; border:2px solid black; height:200px; }
+  div.gap { column-gap:80px; }
   span { display:inline-block; width:200px; }
   </style>
 </head>
 <body>
   <table width="1"><tr><td><div>
     <span></span>
   </div></tr></td></table>
   <table width="1"><tr><td><div class="gap">
--- a/layout/reftests/columns/min-width-2.html
+++ b/layout/reftests/columns/min-width-2.html
@@ -3,51 +3,51 @@
     <meta charset="utf-8">
     <title>Testcase for bug </title>
     <style type="text/css">
 * {
     color:black; background:none; font-size:16px; padding:0; margin:0; font-family:monospace;
 }
 
 .c {
-  -moz-column-rule:2px solid blue;
+  column-rule:2px solid blue;
   -webkit-column-rule:2px solid blue;
   -o-column-rule:2px solid blue;
   -ms-column-rule:2px solid blue;
   column-rule:2px solid blue;
 
-  -moz-column-gap:0;
+  column-gap:0;
   -webkit-column-gap:0;
   -o-column-gap:0;
   -ms-column-gap:0;
   column-gap:0;
 
   height:2.2em;
   line-height:1em;
   border:dotted;
 }
 
 .col2 {
-  -moz-column-count:2;
+  column-count:2;
   -webkit-column-count:2;
   -o-column-count:2;
   -ms-column-count:2;
   column-count:2;
 }
 
 .cw {
-  -moz-column-width:4em;
+  column-width:4em;
   -webkit-column-width:4em;
   -o-column-width:4em;
   -ms-column-width:4em;
   column-width:4em;
 }
 
 .gap {
-  -moz-column-gap:2em;
+  column-gap:2em;
   -webkit-column-gap:2em;
   -o-column-gap:2em;
   -ms-column-gap:2em;
   column-gap:2em;
 }
     </style>
 </head>
 <body>
--- a/layout/reftests/columns/positioning-transforms-bug1112501-ref.html
+++ b/layout/reftests/columns/positioning-transforms-bug1112501-ref.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 </head>
 <body>m
-<div style="-moz-column-count: 2;">m
+<div style="column-count: 2;">m
 <span style="position: absolute;">m m</span>
 </div>
 </body>
 </html>
--- a/layout/reftests/columns/positioning-transforms-bug1112501.html
+++ b/layout/reftests/columns/positioning-transforms-bug1112501.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 </head>
 <body>m
-<div style="-moz-column-count: 2; -moz-transform: scale(1,1); ">m
+<div style="column-count: 2; -moz-transform: scale(1,1); ">m
 <span style="position: fixed;">m m</span>
 </div>
 </body>
 </html>
--- a/layout/reftests/columns/pref-width-1a.html
+++ b/layout/reftests/columns/pref-width-1a.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <style>
-  div { -moz-column-count:2; -moz-column-gap:0; float:left; border:2px solid black; height:200px; }
+  div { column-count:2; column-gap:0; float:left; border:2px solid black; height:200px; }
   div.clear { clear:both; }
-  div.gap { -moz-column-gap:80px; }
+  div.gap { column-gap:80px; }
   span { display:inline-block; width:100px; }
   </style>
 </head>
 <body>
   <div>
     <span></span><br><span></span>
   </div>
   <div class="gap clear">
--- a/layout/reftests/columns/pref-width-1b.html
+++ b/layout/reftests/columns/pref-width-1b.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <style>
-  div { -moz-column-count:2; -moz-column-width:100px; -moz-column-gap:0; float:left; border:2px solid black; height:200px; }
+  div { column-count:2; column-width:100px; column-gap:0; float:left; border:2px solid black; height:200px; }
   div.clear { clear:both; }
-  div.gap { -moz-column-gap:80px; }
+  div.gap { column-gap:80px; }
   span { display:inline-block; width:50px; }
   </style>
 </head>
 <body>
   <div>
     <span></span><br><span></span>
   </div>
   <div class="gap clear">
--- a/layout/reftests/columns/pref-width-1c.html
+++ b/layout/reftests/columns/pref-width-1c.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
   <style>
-  div { -moz-column-count:2; -moz-column-width:100px; -moz-column-gap:0; float:left; border:2px solid black; height:200px; }
+  div { column-count:2; column-width:100px; column-gap:0; float:left; border:2px solid black; height:200px; }
   div.clear { clear:both; }
-  div.gap { -moz-column-gap:80px; }
+  div.gap { column-gap:80px; }
   span { display:inline-block; width:200px; }
   </style>
 </head>
 <body>
   <div>
     <span></span><br><span></span>
   </div>
   <div class="gap clear">
--- a/layout/reftests/css-break/box-decoration-break-block-border-padding-ref.html
+++ b/layout/reftests/css-break/box-decoration-break-block-border-padding-ref.html
@@ -18,25 +18,25 @@
       height: 33px;
       width: 40px;
       background: lime;
       background-clip: content-box;
       margin-bottom: 12px;
     }
 
     .columns {
-      -moz-columns: 3;
+      columns: 3;
       width: 250px;
       height: 50px;
       background: grey;
       margin-top: 2px;
     }
 
     .unbalanced {
-      -moz-column-fill: auto;
+      column-fill: auto;
     }
 
     .inner.p { height:31px; padding:1px 3px 5px 7px; }
     .unbalanced .inner { height:40px; margin-bottom: 0px;}
     .unbalanced .inner.p { height:34px; }
   </style>
 </head>
 <body>
--- a/layout/reftests/css-break/box-decoration-break-block-border-padding.html
+++ b/layout/reftests/css-break/box-decoration-break-block-border-padding.html
@@ -20,25 +20,25 @@
       border: 5px dashed blue;
       height: 99px;
       width: 40px;
       background: lime;
       background-clip: content-box;
     }
 
     .columns {
-      -moz-columns: 3;
+      columns: 3;
       width: 250px;
       height: 50px;
       background: grey;
       margin-top: 2px;
     }
 
     .unbalanced {
-      -moz-column-fill: auto;
+      column-fill: auto;
     }
 
     .inner.p { height:93px; padding:1px 3px 5px 7px; }
   </style>
 </head>
 <body>
 
 <div class="columns"><div class="inner"></div></div>
--- a/layout/reftests/css-break/box-decoration-break-block-margin-ref.html
+++ b/layout/reftests/css-break/box-decoration-break-block-margin-ref.html
@@ -20,31 +20,31 @@
       background: lime;
       background-clip: padding-box;
       margin: 0px 3px 15px 1px;
       position: relative;
       top: 7px;
     }
 
     .columns {
-      -moz-columns: 3;
+      columns: 3;
       width: 250px;
       height: 50px;
       background: grey;
     }
 
     .outer {
       margin-top: 2px;
       height: 50px;
       width: 250px;
       background: grey;
     }
 
     .unbalanced {
-      -moz-column-fill: auto;
+      column-fill: auto;
     }
 
     .unbalanced .inner { height: 28px; }
     .x .inner { height: 28px; }
     .x.unbalanced .inner { height: 28px; }
 
     #t2 .inner { border-style:none; height: 38px; }
   </style>
--- a/layout/reftests/css-break/box-decoration-break-block-margin.html
+++ b/layout/reftests/css-break/box-decoration-break-block-margin.html
@@ -21,25 +21,25 @@
       margin: 7px 3px 5px 1px;
       height: 78px;
       width: 40px;
       background: lime;
       background-clip: content-box;
     }
 
     .columns {
-      -moz-columns: 3;
+      columns: 3;
       width: 250px;
       height: 50px;
       background: grey;
       margin-top: 2px;
     }
 
     .unbalanced {
-      -moz-column-fill: auto;
+      column-fill: auto;
     }
 
     .inner.p { height:87px; }
     .inner.p2 { height:84px; }
 
     .p3, .p4, .p5, .p6 { border-style:none; }
     .inner div { height:16px;  }
     .inner.p3 div { margin: 3px; }
--- a/layout/reftests/css-break/box-decoration-break-border-image-ref.html
+++ b/layout/reftests/css-break/box-decoration-break-border-image-ref.html
@@ -32,28 +32,28 @@ b1,b2,b3,b4,b5,b6,b7,b8,b9,b10,.b.clone 
   background: pink;
   height:28px;
 }
 .col3 .b.clone {
   height:32px;
 }
 
 .columns {
-  -moz-columns: 2;
+  columns: 2;
   width: 200px;
   height: 50px;
   background: grey;
   margin-right: 20px;
   margin-bottom: 20px;
   float:left;
 }
 .col3 {
-  -moz-columns: 3;
+  columns: 3;
 }
-.unbalanced { -moz-column-fill:auto; }
+.unbalanced { column-fill:auto; }
 .vbreak { height:65px; width:41px; }
 .unbalanced .vbreak { height:40px; }
 .h { width:30px;height:30px; background:grey; }
 .m { margin-left:15px; }
 .col3 .vbreak { height:115px; }
 .unbalanced.col3 .vbreak { height:40px; }
 x { display:inline-block; width:31px; height:18px; line-height:1; }
 y { display:inline-block; width:47px; height:18px; line-height:1; }
--- a/layout/reftests/css-break/box-decoration-break-border-image.html
+++ b/layout/reftests/css-break/box-decoration-break-border-image.html
@@ -24,28 +24,28 @@ html,body {
 .b {
   border: 5px solid red;
   border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD%2FgAIDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAoUlEQVR42u3bwQ0AIAgEwcOmtXttgScmsxWQCTyp3EysJo61IliwYMGCBUuwYMGCBQuWYMGCBQsWLMGCBQsWLFiCBQsWLFiwBAsWLFiwYAkWLFiwYMESLFiwYMGCpXaVka%2BsO8dmOUNYggULFixYsAQLFixYsGAJFixYsGDBEixYsGDBgiVYsGDBggVLsGDBggULlmDBggULFizBggUL1t89N%2FYEtBGStpoAAAAASUVORK5CYII%3D) 10 10 repeat;
   background: pink;
   border-image-outset: 7px 3px 5px 9px;
 }
 
 .columns {
-  -moz-columns: 2;
+  columns: 2;
   width: 200px;
   height: 50px;
   background: grey;
   margin-right: 20px;
   margin-bottom: 20px;
   float:left;
 }
 .col3 {
-  -moz-columns: 3;
+  columns: 3;
 }
-.unbalanced { -moz-column-fill:auto; }
+.unbalanced { column-fill:auto; }
 .vbreak { height:65px; width:41px; }
 .h { width:30px;height:30px; background:grey; }
 .m { margin-left:15px; }
 .col3 .vbreak { height:115px; }
 .clone { box-decoration-break:clone; }
 .slice { box-decoration-break:slice; }
 x { display:inline-block; width:31px; height:18px; line-height:1; }
 y { display:inline-block; width:47px; height:18px; line-height:1; }
--- a/layout/reftests/css-break/box-decoration-break-bug-1249913-ref.html
+++ b/layout/reftests/css-break/box-decoration-break-bug-1249913-ref.html
@@ -11,21 +11,21 @@
 body,html { color:black; background:white; font-size:16px; padding:0; margin:0; }
 
 p { height: 27px; width: 100px; margin:0; background:lime; }
 .border { border:3px solid black; }
 .outline { outline:3px solid brown; }
 .shadow { box-shadow: 2px 2px 0 0 blue; }
 
 .columns {
-     -moz-columns: 2;
+     columns: 2;
       -ms-columns: 2;
   -webkit-columns: 2;
           columns: 2;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   width:500px;
   height:30px;
   border:solid silver;
   margin: 2px 0;
 }
--- a/layout/reftests/css-break/box-decoration-break-bug-1249913.html
+++ b/layout/reftests/css-break/box-decoration-break-bug-1249913.html
@@ -14,21 +14,21 @@ body,html { color:black; background:whit
 
 p { height: 50px; width: 100px; margin:0; background:lime; }
 .clone { height: 10px; box-decoration-break:clone; }
 .border { border:3px solid black; }
 .outline { outline:3px solid brown; }
 .shadow { box-shadow: 2px 2px 0 0 blue; }
 
 .columns {
-     -moz-columns: 2;
+     columns: 2;
       -ms-columns: 2;
   -webkit-columns: 2;
           columns: 2;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   width:500px;
   height:30px;
   border:solid silver;
   margin: 2px 0;
 }
--- a/layout/reftests/css-display/display-contents-acid-ref.html
+++ b/layout/reftests/css-display/display-contents-acid-ref.html
@@ -24,17 +24,17 @@
 .foot    { display:table-footer-group; }
 .col     { display:table-column; }
 .colg    { display:table-column-group; }
 .flex    { display:flex; }
 .iflex   { display:inline-flex; }
 .li      { display:list-item; }
 .ib      { display:inline-block; }
 .inline  { display:inline; }
-.columns  { -moz-columns:2; columns:2; height:4em; }
+.columns  { columns:2; columns:2; height:4em; }
 
 
 
 .c1 { color:lime; }
 .c2 { color:pink; }
 .c3 { color:teal; }
 .c4 { color:green; }
 .c5 { color:silver; }
--- a/layout/reftests/css-display/display-contents-acid.html
+++ b/layout/reftests/css-display/display-contents-acid.html
@@ -25,17 +25,17 @@
 .foot    { display:table-footer-group; }
 .col     { display:table-column; }
 .colg    { display:table-column-group; }
 .flex    { display:flex; }
 .iflex   { display:inline-flex; }
 .li      { display:list-item; }
 .ib      { display:inline-block; }
 .inline  { display:inline; }
-.columns  { -moz-columns:2; columns:2; height:4em; }
+.columns  { columns:2; columns:2; height:4em; }
 
 .contents { display:contents; align-items:inherit; justify-items:inherit; }
 
 .c1 { color:lime; }
 .c2 { background:blue; color:pink; }
 .c3 { color:teal; }
 .c4 { color:green; }
 .c5 { color:silver; }
--- a/layout/reftests/css-grid/grid-fragmentation-001-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-001-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .block {
--- a/layout/reftests/css-grid/grid-fragmentation-001.html
+++ b/layout/reftests/css-grid/grid-fragmentation-001.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-002-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-002-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .block {
--- a/layout/reftests/css-grid/grid-fragmentation-002.html
+++ b/layout/reftests/css-grid/grid-fragmentation-002.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-003-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-003-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .block {
--- a/layout/reftests/css-grid/grid-fragmentation-003.html
+++ b/layout/reftests/css-grid/grid-fragmentation-003.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-004-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-004-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .block {
--- a/layout/reftests/css-grid/grid-fragmentation-004.html
+++ b/layout/reftests/css-grid/grid-fragmentation-004.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-005-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-005-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-005.html
+++ b/layout/reftests/css-grid/grid-fragmentation-005.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-006-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-006-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-006.html
+++ b/layout/reftests/css-grid/grid-fragmentation-006.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-007-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-007-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-007.html
+++ b/layout/reftests/css-grid/grid-fragmentation-007.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-008-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-008-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-008.html
+++ b/layout/reftests/css-grid/grid-fragmentation-008.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-009-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-009-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-009.html
+++ b/layout/reftests/css-grid/grid-fragmentation-009.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-015-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-015-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-015.html
+++ b/layout/reftests/css-grid/grid-fragmentation-015.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-016-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-016-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .block {
--- a/layout/reftests/css-grid/grid-fragmentation-016.html
+++ b/layout/reftests/css-grid/grid-fragmentation-016.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-017-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-017-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .block {
--- a/layout/reftests/css-grid/grid-fragmentation-017.html
+++ b/layout/reftests/css-grid/grid-fragmentation-017.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-018-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-018-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-018.html
+++ b/layout/reftests/css-grid/grid-fragmentation-018.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-019-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-019-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-019.html
+++ b/layout/reftests/css-grid/grid-fragmentation-019.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-020-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-020-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 .no-border { border-style:none; }
 
--- a/layout/reftests/css-grid/grid-fragmentation-020.html
+++ b/layout/reftests/css-grid/grid-fragmentation-020.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 .no-border { border-style:none; }
 
--- a/layout/reftests/css-grid/grid-fragmentation-021-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-021-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 3;
+     columns: 3;
       -ms-columns: 3;
   -webkit-columns: 3;
           columns: 3;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 1px;
   height: 150px;
 }
 .no-border { border-style:none; }
--- a/layout/reftests/css-grid/grid-fragmentation-021.html
+++ b/layout/reftests/css-grid/grid-fragmentation-021.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 3;
+     columns: 3;
       -ms-columns: 3;
   -webkit-columns: 3;
           columns: 3;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 1px;
   height: 150px;
 }
 .no-border { border-style:none; }
--- a/layout/reftests/css-grid/grid-fragmentation-022.html
+++ b/layout/reftests/css-grid/grid-fragmentation-022.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-023-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-023-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-023.html
+++ b/layout/reftests/css-grid/grid-fragmentation-023.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-024-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-024-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-024.html
+++ b/layout/reftests/css-grid/grid-fragmentation-024.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-025-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-025-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-025.html
+++ b/layout/reftests/css-grid/grid-fragmentation-025.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-026-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-026-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-026.html
+++ b/layout/reftests/css-grid/grid-fragmentation-026.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-027.html
+++ b/layout/reftests/css-grid/grid-fragmentation-027.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-028-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-028-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-028.html
+++ b/layout/reftests/css-grid/grid-fragmentation-028.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-029-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-029-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-029.html
+++ b/layout/reftests/css-grid/grid-fragmentation-029.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-030-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-030-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-030.html
+++ b/layout/reftests/css-grid/grid-fragmentation-030.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-031-ref.html
+++ b/layout/reftests/css-grid/grid-fragmentation-031-ref.html
@@ -10,21 +10,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-fragmentation-031.html
+++ b/layout/reftests/css-grid/grid-fragmentation-031.html
@@ -12,21 +12,21 @@
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 body { overflow:hidden; }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
 }
 
 .grid {
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-004-ref.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-004-ref.html
@@ -10,21 +10,21 @@
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
   height: 120px;
 }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-004.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-004.html
@@ -12,21 +12,21 @@
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
 
 .columns {
   position:relative;
-     -moz-columns: 5;
+     columns: 5;
       -ms-columns: 5;
   -webkit-columns: 5;
           columns: 5;
-     -moz-column-fill: auto;
+     column-fill: auto;
       -ms-column-fill: auto;
   -webkit-column-fill: auto;
           column-fill: auto;
   border: 2px dashed;
   margin-bottom: 5px;
   height: 120px;
 }
 
--- a/layout/reftests/css-visited/column-rule-1-notref.html
+++ b/layout/reftests/css-visited/column-rule-1-notref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
-div { margin: 8px; -moz-column-count: 2; }
-#link { -moz-column-rule: medium dotted blue; }
-#visited { -moz-column-rule: medium dotted black; }
+div { margin: 8px; column-count: 2; }
+#link { column-rule: medium dotted blue; }
+#visited { column-rule: medium dotted black; }
 
 </style>
 <div id="link">unvisited<br>link</div>
 <div id="visited">visited<br>link</div>
--- a/layout/reftests/css-visited/column-rule-1-ref.html
+++ b/layout/reftests/css-visited/column-rule-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
-div { margin: 8px; -moz-column-count: 2; }
-#link { -moz-column-rule: medium dotted blue; }
-#visited { -moz-column-rule: medium dotted silver; }
+div { margin: 8px; column-count: 2; }
+#link { column-rule: medium dotted blue; }
+#visited { column-rule: medium dotted silver; }
 
 </style>
 <div id="link">unvisited<br>link</div>
 <div id="visited">visited<br>link</div>
--- a/layout/reftests/css-visited/column-rule-1.html
+++ b/layout/reftests/css-visited/column-rule-1.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <title>Test for privacy restrictions on :visited (Bug 147777)</title>
 <style type="text/css">
 
-a { text-decoration: none; color: initial; display: block; margin: 8px; -moz-column-count: 2; }
-:link { -moz-column-rule: medium dotted blue; }
-:visited { -moz-column-rule: thick dashed silver; }
+a { text-decoration: none; color: initial; display: block; margin: 8px; column-count: 2; }
+:link { column-rule: medium dotted blue; }
+:visited { column-rule: thick dashed silver; }
 
 </style>
 <a href="unvisited-page.html">unvisited<br>link</a>
 <a href="visited-page.html">visited<br>link</a>
--- a/layout/reftests/details-summary/details-three-columns-ref.html
+++ b/layout/reftests/details-summary/details-three-columns-ref.html
@@ -3,18 +3,18 @@
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <style>
   summary {
     background-color: lightgreen;
   }
   div#columns {
-    -moz-column-count: 3;
-    -moz-column-rule: 1px solid lightgray;
+    column-count: 3;
+    column-rule: 1px solid lightgray;
     -webkit-column-count: 3;
     -webkit-column-rule: 1px solid lightgray;
     border: 1px solid lightblue;
   }
   </style>
   <body>
     <div id="columns">
       <summary>Summary</summary>
--- a/layout/reftests/details-summary/details-three-columns.html
+++ b/layout/reftests/details-summary/details-three-columns.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <style>
   details {
-    -moz-column-count: 3;
-    -moz-column-rule: 1px solid lightgray;
+    column-count: 3;
+    column-rule: 1px solid lightgray;
     -webkit-column-count: 3;
     -webkit-column-rule: 1px solid lightgray;
     border: 1px solid lightblue;
   }
   summary::-moz-list-bullet {
     /* Hide the triangle for comparing with div in reftest. */
     list-style-type: none;
   }
--- a/layout/reftests/details-summary/summary-three-columns-ref.html
+++ b/layout/reftests/details-summary/summary-three-columns-ref.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <style>
   .summary-columns {
-    -moz-column-count: 3;
-    -moz-column-rule: 1px solid lightgray;
+    column-count: 3;
+    column-rule: 1px solid lightgray;
     -webkit-column-count: 3;
     -webkit-column-rule: 1px solid lightgray;
     border: 1px solid lightblue;
     background-color: lightgreen;
   }
   </style>
   <body>
     <div>
--- a/layout/reftests/details-summary/summary-three-columns.html
+++ b/layout/reftests/details-summary/summary-three-columns.html
@@ -4,18 +4,18 @@
 
 <html>
   <style>
   summary::-moz-list-bullet {
     /* Hide the triangle for comparing with div in reftest. */
     list-style-type: none;
   }
   summary {
-    -moz-column-count: 3;
-    -moz-column-rule: 1px solid lightgray;
+    column-count: 3;
+    column-rule: 1px solid lightgray;
     -webkit-column-count: 3;
     -webkit-column-rule: 1px solid lightgray;
     border: 1px solid lightblue;
     background-color: lightgreen;
   }
   </style>
   <body>
     <details open>
--- a/layout/reftests/first-line/stress-10.html
+++ b/layout/reftests/first-line/stress-10.html
@@ -1,5 +1,5 @@
 <style>
 *::first-line { }
 *::before { content:"before text";}
 </style>
-<object style="position: fixed;-moz-column-count: 100;"><ol style="float: right;">
+<object style="position: fixed;column-count: 100;"><ol style="float: right;">
--- a/layout/reftests/first-line/stress-6.html
+++ b/layout/reftests/first-line/stress-6.html
@@ -7,17 +7,17 @@ nobr::first-line { font-size:110%;}
 #b td::after { content:"anonymous text"; }
 nobr::after{ content:"anonymous text"; }
 
 #b::before { content:"before text";}
 #b td::before { content:"before text";}
 </style>
 </head>
 <body>
-<table style="display: table-row;"></table><nobr style="display: list-item; -moz-column-count: 2;">
+<table style="display: table-row;"></table><nobr style="display: list-item; column-count: 2;">
 <table id="b" style="display: inline;"></table>
 </nobr>
 <br>
 This page should not crash Mozilla
 <script>
 function doe(){
    var td = document.createElement('td');;
    td.setAttribute('height', '50%');
--- a/layout/reftests/first-line/stress-7.html
+++ b/layout/reftests/first-line/stress-7.html
@@ -2,16 +2,16 @@
 <html><head>
 <style>
 body > span::first-line { }
 span::before { content:"before text"; border:3px solid black;}
 </style>
 </head>
 <body>
 
-<span style=" float: left; -moz-column-count: 2;">
+<span style=" float: left; column-count: 2;">
   <span style="float: right;">
-    <span style=" float: right;-moz-column-count: 2;"></span>
+    <span style=" float: right;column-count: 2;"></span>
   </span>
 </span>
 
 </body>
 </html>
--- a/layout/reftests/first-line/stress-9-ref.html
+++ b/layout/reftests/first-line/stress-9-ref.html
@@ -2,13 +2,13 @@
 <html><head>
 <style>
 *::after { content:"anonymous text"; }
 *::before { content:"before text"; }
 </style>
 </head>
 <body>
 
-<ol style="overflow: hidden;  float: right; -moz-column-count: 3;">
+<ol style="overflow: hidden;  float: right; column-count: 3;">
 <span style="overflow: auto;  float: left;"></span>
 </ol>
 </body>
 </html>
--- a/layout/reftests/first-line/stress-9.html
+++ b/layout/reftests/first-line/stress-9.html
@@ -3,13 +3,13 @@
 <style>
 *::first-line { }
 *::after { content:"anonymous text"; }
 *::before { content:"before text"; }
 </style>
 </head>
 <body>
 
-<ol style="overflow: hidden;  float: right; -moz-column-count: 3;">
+<ol style="overflow: hidden;  float: right; column-count: 3;">
 <span style="overflow: auto;  float: left;"></span>
 </ol>
 </body>
 </html>
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1-ref.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1-ref.html
@@ -2,18 +2,18 @@
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .flexContainer {
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
       border: 0 dashed black;
     }
     </style>
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1a.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1a.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: row".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .flexContainer {
       display: flex;
       flex-direction: row;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
       border: 0 dashed black;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1b.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1b.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: row-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .flexContainer {
       display: flex;
       flex-direction: row-reverse;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
       border: 0 dashed black;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1c.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1c.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: column".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .flexContainer {
       display: flex;
       flex-direction: column;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
       border: 0 dashed black;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1d.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1d.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: column-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .flexContainer {
       display: flex;
       flex-direction: column-reverse;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
       border: 0 dashed black;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1e.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1e.html
@@ -7,18 +7,18 @@
      and with the flex container having "flex-direction: row".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .fixedHeightBlock {
       height: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: row;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1f.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1f.html
@@ -7,18 +7,18 @@
      and with the flex container having "flex-direction: row-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .fixedHeightBlock {
       height: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: row-reverse;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1g.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1g.html
@@ -7,18 +7,18 @@
      and with the flex container having "flex-direction: column".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .fixedHeightBlock {
       height: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: column;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-1h.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-1h.html
@@ -7,18 +7,18 @@
      and with the flex container having "flex-direction: column-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
     }
     .fixedHeightBlock {
       height: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: column-reverse;
--- a/layout/reftests/flexbox/pagination/flexbox-empty-2-ref.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-2-ref.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: row".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 2px;
     }
     .flexContainer {
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
       border: 0 dashed black;
     }
--- a/layout/reftests/flexbox/pagination/flexbox-empty-2a.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-2a.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: row".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: row;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
--- a/layout/reftests/flexbox/pagination/flexbox-empty-2b.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-2b.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: row-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: row-reverse;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
--- a/layout/reftests/flexbox/pagination/flexbox-empty-2c.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-2c.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: column".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: column;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
--- a/layout/reftests/flexbox/pagination/flexbox-empty-2d.html
+++ b/layout/reftests/flexbox/pagination/flexbox-empty-2d.html
@@ -6,18 +6,18 @@
      and with the flex container having "flex-direction: column-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 2px;
     }
     .flexContainer {
       display: flex;
       flex-direction: column-reverse;
       background: teal;
       /* border-width is 0 by default; some sub-testcases will increase it. */
--- a/layout/reftests/flexbox/pagination/flexbox-multicol-vert-empty-2.html
+++ b/layout/reftests/flexbox/pagination/flexbox-multicol-vert-empty-2.html
@@ -8,18 +8,18 @@
       display: flex;
       flex-direction: column;
       border: 2px dotted black;
       height: 298px;
     }
     .multicol {
       height: 100px;
       width: 200px;
-      -moz-column-width: 20px;
-      -moz-column-fill: auto;
+      column-width: 20px;
+      column-fill: auto;
       border: 4px solid orange;
     }
     </style>
   </head>
   <body>
     <div class="multicol">
       <div class="flexContainer">
       </div>
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1-ref.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1-ref.html
@@ -2,18 +2,18 @@
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       background: teal;
       border: 1px dashed black;
     }
     .item {
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html
@@ -6,18 +6,18 @@
      "flex-wrap: wrap".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
       background: teal;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a.html
@@ -5,18 +5,18 @@
      child, with the flex container having "flex-direction: row".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: row;
       background: teal;
       border: 1px dashed black;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html
@@ -6,18 +6,18 @@
      "flex-wrap: wrap".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: row-reverse;
       flex-wrap: wrap;
       background: teal;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b.html
@@ -5,18 +5,18 @@
      child, with the flex container having "flex-direction: row-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: row-reverse;
       background: teal;
       border: 1px dashed black;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html
@@ -6,18 +6,18 @@
      "flex-wrap: wrap".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
       background: teal;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c.html
@@ -5,18 +5,18 @@
      child, with the flex container having "flex-direction: column".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: column;
       background: teal;
       border: 1px dashed black;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html
@@ -6,18 +6,18 @@
      and "flex-wrap: wrap".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: column-reverse;
       flex-wrap: wrap;
       justify-content: flex-end;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d.html
@@ -5,18 +5,18 @@
      child, with the flex container having "flex-direction: column-reverse".
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 10px;
       width: 100px;
-      -moz-column-width: 30px;
-      -moz-column-fill: auto;
+      column-width: 30px;
+      column-fill: auto;
       border: 2px solid orange;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: column-reverse;
       justify-content: flex-end;
       background: teal;
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2-ref.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2-ref.html
@@ -5,18 +5,18 @@
      multi-line vertical flexbox.
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 40px;
       width: 100px;
-      -moz-column-width: 60px;
-      -moz-column-fill: auto;
+      column-width: 60px;
+      column-fill: auto;
       border: 2px solid purple;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       background: yellow;
       border: 1px dashed black;
     }
     .item {
--- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2.html
+++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2.html
@@ -5,18 +5,18 @@
      multi-line vertical flexbox.
 -->
 <html>
   <head>
     <style>
     .multicol {
       height: 40px;
       width: 100px;
-      -moz-column-width: 60px;
-      -moz-column-fill: auto;
+      column-width: 60px;
+      column-fill: auto;
       border: 2px solid purple;
       margin-bottom: 15px; /* (just for spacing between testcases) */
     }
     .flexContainer {
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
       align-content: flex-start;
--- a/layout/reftests/forms/button/display-grid-flex-columnset-ref.html
+++ b/layout/reftests/forms/button/display-grid-flex-columnset-ref.html
@@ -15,17 +15,17 @@
 .igrid { display:inline-grid; }
 
 .flex, .iflex {
   display: flex;
 }
 .iflex { display:inline-flex; }
 
 .columnset, .block-columnset {
-     -moz-columns: 2;
+     columns: 2;
       -ms-columns: 2;
   -webkit-columns: 2;
           columns: 2;
 }
 
 .block-columnset, .b { display: block; }
 
 a {
--- a/layout/reftests/forms/button/display-grid-flex-columnset.html
+++ b/layout/reftests/forms/button/display-grid-flex-columnset.html
@@ -15,17 +15,17 @@
 .igrid { display:inline-grid; }
 
 .flex, .iflex {
   display: flex;
 }
 .iflex { display:inline-flex; }
 
 .columnset {
-     -moz-columns: 2;
+     columns: 2;
       -ms-columns: 2;
   -webkit-columns: 2;
           columns: 2;
 }
 
 .b { display: block; }
 
 a {
--- a/layout/reftests/list-item/numbering-1-ref.html
+++ b/layout/reftests/list-item/numbering-1-ref.html
@@ -11,15 +11,15 @@
     <li>List item 3</li>
     <li>List item 4</li>
     <li>List item 5</li>
     <li>List item 6</li>
     <div><li>List item 7</li></div>
 </ol>
 
 <ol style="list-style: decimal inside;">
-    <div style="-moz-column-width:1em; column-width:1em;"><li></li><div>item1</div></div>
-    <div style="-moz-column-width:1em; column-width:1em;"><li></li><div>item2</div></div>
-    <div style="-moz-column-width:1em; column-width:1em;"><li></li><div>item3</div></div>
+    <div style="column-width:1em; column-width:1em;"><li></li><div>item1</div></div>
+    <div style="column-width:1em; column-width:1em;"><li></li><div>item2</div></div>
+    <div style="column-width:1em; column-width:1em;"><li></li><div>item3</div></div>
 </ol>
 
 </body>
 </html>
--- a/layout/reftests/list-item/numbering-1.html
+++ b/layout/reftests/list-item/numbering-1.html
@@ -11,15 +11,15 @@
     <li>List item 3</li>
     <li style="overflow: hidden">List item 4</li>
     <li style="overflow: hidden">List item 5</li>
     <li>List item 6</li>
     <div style="overflow: hidden"><li>List item 7</li></div>
 </ol>
 
 <ol style="list-style: decimal inside;">
-    <li style="-moz-column-width:1em; column-width:1em;">item1</li>
-    <li style="-moz-column-width:1em; column-width:1em;">item2</li>
-    <li style="-moz-column-width:1em; column-width:1em;">item3</li>
+    <li style="column-width:1em; column-width:1em;">item1</li>
+    <li style="column-width:1em; column-width:1em;">item2</li>
+    <li style="column-width:1em; column-width:1em;">item3</li>
 </ol>
 
 </body>
 </html>
--- a/layout/reftests/list-item/numbering-3-ref.html
+++ b/layout/reftests/list-item/numbering-3-ref.html
@@ -38,15 +38,15 @@ l { display:block; list-style: decimal i
 <div style="display:grid">
     <l start="1"><li style="overflow: hidden">List item 1</li></l>
     <l start="2"><li style="overflow: hidden">List item 2</li></l>
     <l start="3"><li>List item 3</li></l>
 </div>
 </ol>
 
 <ol style="display:grid; list-style-type:none">
-    <l start="1"><li style="-moz-column-width:1em; column-width:1em;">item1</li></l>
-    <l start="2"><li style="-moz-column-width:1em; column-width:1em;">item2</li></l>
-    <l start="3"><li style="-moz-column-width:1em; column-width:1em;">item3</li></l>
+    <l start="1"><li style="column-width:1em; column-width:1em;">item1</li></l>
+    <l start="2"><li style="column-width:1em; column-width:1em;">item2</li></l>
+    <l start="3"><li style="column-width:1em; column-width:1em;">item3</li></l>
 </ol>
 
 </body>
 </html>
--- a/layout/reftests/list-item/numbering-3.html
+++ b/layout/reftests/list-item/numbering-3.html
@@ -35,15 +35,15 @@
 <div style="display:grid">
     <li style="overflow: hidden">List item 1</li>
     <li style="overflow: hidden">List item 2</li>
     <li>List item 3</li>
 </div>
 </ol>
 
 <ol style="list-style: decimal inside; display:grid">
-    <li style="-moz-column-width:1em; column-width:1em;">item1</li>
-    <li style="-moz-column-width:1em; column-width:1em;">item2</li>
-    <li style="-moz-column-width:1em; column-width:1em;">item3</li>
+    <li style="column-width:1em; column-width:1em;">item1</li>
+    <li style="column-width:1em; column-width:1em;">item2</li>
+    <li style="column-width:1em; column-width:1em;">item3</li>
 </ol>
 
 </body>
 </html>
--- a/layout/reftests/list-item/numbering-4-ref.html
+++ b/layout/reftests/list-item/numbering-4-ref.html
@@ -38,15 +38,15 @@ l { display:block; list-style: decimal i
 <div style="display:flex">
     <l start="1"><li style="overflow: hidden">List item 1</li></l>
     <l start="2"><li style="overflow: hidden">List item 2</li></l>
     <l start="3"><li>List item 3</li></l>
 </div>
 </ol>
 
 <ol style="display:flex; list-style-type:none">
-    <l start="1"><li style="-moz-column-width:1em; column-width:1em;">item1</li></l>
-    <l start="2"><li style="-moz-column-width:1em; column-width:1em;">item2</li></l>
-    <l start="3"><li style="-moz-column-width:1em; column-width:1em;">item3</li></l>
+    <l start="1"><li style="column-width:1em; column-width:1em;">item1</li></l>
+    <l start="2"><li style="column-width:1em; column-width:1em;">item2</li></l>
+    <l start="3"><li style="column-width:1em; column-width:1em;">item3</li></l>
 </ol>
 
 </body>
 </html>
--- a/layout/reftests/list-item/numbering-4.html
+++ b/layout/reftests/list-item/numbering-4.html
@@ -35,15 +35,15 @@
 <div style="display:flex">
     <li style="overflow: hidden">List item 1</li>
     <li style="overflow: hidden">List item 2</li>
     <li>List item 3</li>
 </div>
 </ol>
 
 <ol style="list-style: decimal inside; display:flex">
-    <li style="-moz-column-width:1em; column-width:1em;">item1</li>
-    <li style="-moz-column-width:1em; column-width:1em;">item2</li>
-    <li style="-moz-column-width:1em; column-width:1em;">item3</li>
+    <li style="column-width:1em; column-width:1em;">item1</li>
+    <li style="column-width:1em; column-width:1em;">item2</li>
+    <li style="column-width:1em; column-width:1em;">item3</li>
 </ol>
 
 </body>
 </html>
--- a/layout/reftests/margin-collapsing/column-child-1.html
+++ b/layout/reftests/margin-collapsing/column-child-1.html
@@ -2,17 +2,17 @@
 <html>
 <head>
 <style type="text/css">
 .separator, #child {
  height: 20px;
  background-color: blue;
 }
 #multi-column {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  background-color: yellow;
 }
 #child {
  margin: 20px 0;
 }
 </style>
 </head>
--- a/layout/reftests/margin-collapsing/column-sibling-1a-dyn.html
+++ b/layout/reftests/margin-collapsing/column-sibling-1a-dyn.html
@@ -6,17 +6,17 @@
  height: 20px;
  background-color: orange;
 }
 #block1 {
  margin-bottom: 10px;
 }
 #multi-column {
  display: none;
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  margin: 20px 0;
  background-color: blue;
 }
 #block2 {
  margin-top: 10px;
 }
--- a/layout/reftests/margin-collapsing/column-sibling-1a.html
+++ b/layout/reftests/margin-collapsing/column-sibling-1a.html
@@ -5,17 +5,17 @@
 #block1, #block2 {
  height: 20px;
  background-color: orange;
 }
 #block1 {
  margin-bottom: 10px;
 }
 #multi-column {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  margin: 20px 0;
  background-color: blue;
 }
 #block2 {
  margin-top: 10px;
 }
--- a/layout/reftests/margin-collapsing/column-sibling-1b-dyn.html
+++ b/layout/reftests/margin-collapsing/column-sibling-1b-dyn.html
@@ -6,17 +6,17 @@
  height: 20px;
  background-color: orange;
 }
 #block1 {
  margin-bottom: 20px;
 }
 #multi-column {
  display: none;
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  margin: 10px 0;
  background-color: blue;
 }
 #block2 {
  margin-top: 20px;
 }
--- a/layout/reftests/margin-collapsing/column-sibling-1b.html
+++ b/layout/reftests/margin-collapsing/column-sibling-1b.html
@@ -5,17 +5,17 @@
 #block1, #block2 {
  height: 20px;
  background-color: orange;
 }
 #block1 {
  margin-bottom: 20px;
 }
 #multi-column {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  margin: 10px 0;
  background-color: blue;
 }
 #block2 {
  margin-top: 20px;
 }
--- a/layout/reftests/margin-collapsing/column-sibling-1c-dyn.html
+++ b/layout/reftests/margin-collapsing/column-sibling-1c-dyn.html
@@ -6,17 +6,17 @@
  height: 20px;
  background-color: orange;
 }
 #block1 {
  margin-bottom: 20px;
 }
 #multi-column {
  display: none;
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  margin: 20px 0;
  background-color: blue;
 }
 #block2 {
  margin-top: 20px;
 }
--- a/layout/reftests/margin-collapsing/column-sibling-1c.html
+++ b/layout/reftests/margin-collapsing/column-sibling-1c.html
@@ -5,17 +5,17 @@
 #block1, #block2 {
  height: 20px;
  background-color: orange;
 }
 #block1 {
  margin-bottom: 20px;
 }
 #multi-column {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  margin: 20px 0;
  background-color: blue;
 }
 #block2 {
  margin-top: 20px;
 }
--- a/layout/reftests/margin-collapsing/column-sibling-2a-dyn.html
+++ b/layout/reftests/margin-collapsing/column-sibling-2a-dyn.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
 #multi-column1, #multi-column2, #multi-column3 {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  background-color: blue;
 }
 #multi-column1 {
  margin-bottom: 10px;
 }
 #multi-column2 {
--- a/layout/reftests/margin-collapsing/column-sibling-2a.html
+++ b/layout/reftests/margin-collapsing/column-sibling-2a.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 #multi-column1, #multi-column2, #multi-column3 {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  background-color: blue;
 }
 #multi-column1 {
  margin-bottom: 10px;
 }
 #multi-column2 {
--- a/layout/reftests/margin-collapsing/column-sibling-2b-dyn.html
+++ b/layout/reftests/margin-collapsing/column-sibling-2b-dyn.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
 #multi-column1, #multi-column2, #multi-column3 {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  background-color: blue;
 }
 #multi-column1 {
  margin-bottom: 20px;
 }
 #multi-column2 {
--- a/layout/reftests/margin-collapsing/column-sibling-2b.html
+++ b/layout/reftests/margin-collapsing/column-sibling-2b.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 #multi-column1, #multi-column2, #multi-column3 {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  background-color: blue;
 }
 #multi-column1 {
  margin-bottom: 20px;
 }
 #multi-column2 {
--- a/layout/reftests/margin-collapsing/column-sibling-2c-dyn.html
+++ b/layout/reftests/margin-collapsing/column-sibling-2c-dyn.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
 <style type="text/css">
 #multi-column1, #multi-column2, #multi-column3 {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  background-color: blue;
 }
 #multi-column1 {
  margin-bottom: 20px;
 }
 #multi-column2 {
--- a/layout/reftests/margin-collapsing/column-sibling-2c.html
+++ b/layout/reftests/margin-collapsing/column-sibling-2c.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 #multi-column1, #multi-column2, #multi-column3 {
- -moz-column-count: 1;
+ column-count: 1;
  column-count: 1;
  height: 20px;
  background-color: blue;
 }
 #multi-column1 {
  margin-bottom: 20px;
 }
 #multi-column2 {
--- a/layout/reftests/pagination/abspos-overflow-01-cols.xhtml
+++ b/layout/reftests/pagination/abspos-overflow-01-cols.xhtml
@@ -27,19 +27,19 @@
       text-align: center;
       position: relative;
       background: white;
       width: 100pt;
     }
     #colset {
       width: 300pt;
       height: 2in;
-      -moz-column-count: 3;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-count: 3;
+      column-gap: 0;
+      column-fill: auto;
       border: silver 2pt;
       border-style: none solid;
     }
     #redline {
       width: 303pt;
       border-top: 4px solid red;
       margin-top: -1in;
       position: relative;
--- a/layout/reftests/pagination/border-breaking-000-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-000-cols.xhtml
@@ -18,19 +18,19 @@
     }
     p + p {
       height: 200px;
     }
 
     body {
       height: 200px;
       width: 300px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: solid silver;
       border-style: none solid;
     }
   </style>
  </head>
  <body>
   <div class="container">
     <div class="box">
--- a/layout/reftests/pagination/border-breaking-001-cols.ref.xhtml
+++ b/layout/reftests/pagination/border-breaking-001-cols.ref.xhtml
@@ -13,19 +13,19 @@
       background: aqua;
       width: 40px;
       height: 500px;
     }
 
     .body {
       height: 200px;
       width: 300px;
-      -moz-column-width: 100px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 100px;
+      column-gap: 0;
+      column-fill: auto;
       border: solid silver;
       border-style: none solid;
       background: yellow;
     }
   </style>
  </head>
  <body>
   <div class="body">
--- a/layout/reftests/pagination/border-breaking-001-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-001-cols.xhtml
@@ -42,19 +42,19 @@
     .block {
       background: yellow;
       height: 100px;
     }
 
     body {
       height: 200px;
       width: 300px;
-      -moz-column-width: 100px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 100px;
+      column-gap: 0;
+      column-fill: auto;
       border: solid silver;
       border-style: none solid;
     }
   </style>
  </head>
  <body>
   <div class="abs">
     <div class="container">
--- a/layout/reftests/pagination/border-breaking-002-cols.ref.xhtml
+++ b/layout/reftests/pagination/border-breaking-002-cols.ref.xhtml
@@ -9,19 +9,19 @@
     }
     .container2 {
       border-top: solid 10px aqua;
     }
 
     .multicol {
       height: 200px;
       width: 300px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: solid silver;
     }
   </style>
  </head>
  <body>
   There must be a continuous 10px line at the top
   of the gray box, the left half blue and the right
   half aqua.
--- a/layout/reftests/pagination/border-breaking-002-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-002-cols.xhtml
@@ -10,19 +10,19 @@
     .overflow {
       height: 195px;
       border-bottom: solid 10px aqua;
     }
 
     .multicol {
       height: 200px;
       width: 300px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: solid silver;
     }
   </style>
  </head>
  <body>
   There must be a continuous 10px line at the top
   of the gray box, the left half blue and the right
   half aqua.
--- a/layout/reftests/pagination/border-breaking-003-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-003-cols.xhtml
@@ -13,19 +13,19 @@
     .rainbow {
       border-top: 10px solid blue;
       border-bottom: 10px solid aqua;
     }
 
     .multicol {
       height: 200px;
       width: 300px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: solid silver;
     }
   </style>
  </head>
  <body>
   There must be two continuous 10px lines at the top
   of the gray box, the top one blue and the bottom one
   aqua.
--- a/layout/reftests/pagination/border-breaking-004-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-004-cols.xhtml
@@ -9,18 +9,18 @@
     .overflow {
       height: 185px;
       border-top: solid 10px blue;
     }
 
     .multicol {
       height: 200px;
       width: 300px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
+      column-width: 150px;
+      column-gap: 0;
       border: solid silver;
     }
   </style>
  </head>
  <body>
   There must be a continuous 10px line at the top
   of the gray box, the left half blue and the right
   half aqua.
--- a/layout/reftests/pagination/column-balancing-break-inside-avoid-2-ref.html
+++ b/layout/reftests/pagination/column-balancing-break-inside-avoid-2-ref.html
@@ -10,22 +10,22 @@
     100px/50px/51+px
     100px/30px/74+px
    Get only an assert unless you set ".d { position: absolute; }".
    
    Trigger hang (separate issue, absolute not needed):
     10px/10px/9999px
     10px/10px/999999px --> "bad height" notreached
 */
-/* Note: The -moz-column-gap and the backgrounds 
+/* Note: The column-gap and the backgrounds 
    are just added here for easier visualization */
 #colset { width: 200px;
           padding: 2px;
-          -moz-column-count: 3;
-          -moz-column-gap: 2px; }
+          column-count: 3;
+          column-gap: 2px; }
 #a      { height: 100px;   background: lightblue;}
 #b      { height:  50px;   background: lightblue;}
 #c      { height:  51px;   background: orange;}
 </style>
 <script>
   function boom() {
     document.getElementById('colset').offsetHeight;
     document.getElementById('a').style.height = 'auto';
--- a/layout/reftests/pagination/column-balancing-break-inside-avoid-2.html
+++ b/layout/reftests/pagination/column-balancing-break-inside-avoid-2.html
@@ -10,22 +10,22 @@
     100px/50px/51+px
     100px/30px/74+px
    Get only an assert unless you set ".d { position: absolute; }".
    
    Trigger hang (separate issue, absolute not needed):
     10px/10px/9999px
     10px/10px/999999px --> "bad height" notreached
 */
-/* Note: The -moz-column-gap and the backgrounds 
+/* Note: The column-gap and the backgrounds 
    are just added here for easier visualization */
 #colset { width: 200px;
           padding: 2px;
-          -moz-column-count: 3;
-          -moz-column-gap: 2px; }
+          column-count: 3;
+          column-gap: 2px; }
 #a      { height: 100px;   background: lightblue;}
 #b      { height:  50px;   background: lightblue;}
 #c      { height:  51px;   background: orange;}
 div {page-break-inside:avoid; }
 </style>
 <script>
   function boom() {
     document.getElementById('colset').offsetHeight;
--- a/layout/reftests/pagination/content-inserted-000.ref.xhtml
+++ b/layout/reftests/pagination/content-inserted-000.ref.xhtml
@@ -6,18 +6,18 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 400px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
+      column-width: 150px;
+      column-gap: 0;
       border: 3px solid silver;
     }
 
     #x {
       height: 200px;
       border-bottom: 3px solid blue;
     }
 
--- a/layout/reftests/pagination/content-inserted-000.xhtml
+++ b/layout/reftests/pagination/content-inserted-000.xhtml
@@ -6,18 +6,18 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 400px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
+      column-width: 150px;
+      column-gap: 0;
       border: 3px solid silver;
     }
 
     #x {
       height: 200px;
       border-bottom: 3px solid blue;
     }
 
--- a/layout/reftests/pagination/content-inserted-001.ref.xhtml
+++ b/layout/reftests/pagination/content-inserted-001.ref.xhtml
@@ -6,18 +6,18 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
+      column-width: 150px;
+      column-gap: 0;
       border: 3px solid silver;
     }
 
     #x {
       height: 500px;
     }
 </style>
 </head>
--- a/layout/reftests/pagination/content-inserted-001.xhtml
+++ b/layout/reftests/pagination/content-inserted-001.xhtml
@@ -6,18 +6,18 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
+      column-width: 150px;
+      column-gap: 0;
       border: 3px solid silver;
     }
 
     #x {
       height: 500px;
     }
 </style>
 </head>
--- a/layout/reftests/pagination/content-inserted-002.ref.xhtml
+++ b/layout/reftests/pagination/content-inserted-002.ref.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #mark {
       border-bottom: 4px solid blue;
     }
 
     #shift {
--- a/layout/reftests/pagination/content-inserted-002.xhtml
+++ b/layout/reftests/pagination/content-inserted-002.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #x {
       height: 500px;
     }
 
     #x:after {
--- a/layout/reftests/pagination/content-inserted-003.xhtml
+++ b/layout/reftests/pagination/content-inserted-003.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #x {
       height: 500px;
     }
 
     #x:after {
--- a/layout/reftests/pagination/content-inserted-004.xhtml
+++ b/layout/reftests/pagination/content-inserted-004.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #x {
       height: 500px;
     }
 
     #x:before {
--- a/layout/reftests/pagination/content-inserted-005.xhtml
+++ b/layout/reftests/pagination/content-inserted-005.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #x {
       border-bottom: 4px solid blue;
     }
 
     #x:before {
--- a/layout/reftests/pagination/content-inserted-006.xhtml
+++ b/layout/reftests/pagination/content-inserted-006.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #x {
       height: 500px;
     }
 
     #x:after {
--- a/layout/reftests/pagination/content-inserted-007.xhtml
+++ b/layout/reftests/pagination/content-inserted-007.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #x {
       height: 500px;
     }
 
     #x:before {
--- a/layout/reftests/pagination/content-inserted-008.xhtml
+++ b/layout/reftests/pagination/content-inserted-008.xhtml
@@ -6,18 +6,18 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
+      column-width: 150px;
+      column-gap: 0;
       border: 3px solid silver;
     }
 
     #shift {
       height: 0;
     }
     #overflow {
       height: 500px;
--- a/layout/reftests/pagination/content-inserted-009.xhtml
+++ b/layout/reftests/pagination/content-inserted-009.xhtml
@@ -6,19 +6,19 @@
   <style type="text/css">
     body {
       font-size: 16px;
     }
 
     #colset {
       height: 200px;
       width: 450px;
-      -moz-column-width: 150px;
-      -moz-column-gap: 0;
-      -moz-column-fill: auto;
+      column-width: 150px;
+      column-gap: 0;
+      column-fill: auto;
       border: 3px solid silver;
     }
 
     #shift {
       height: 201px;
       border-bottom: 2px solid blue;
     }
     #overflow {
--- a/layout/reftests/pagination/dynamic-abspos-overflow-01-cols.xhtml
+++ b/layout/reftests/pagination/dynamic-abspos-overflow-01-cols.xhtml
@@ -24,18 +24,18 @@
       position: relative;
       background: white;
       width: 100pt;
     }
     #colset {
       padding-top: 1px;
       width: 300pt;
       height: 2in;
-      -moz-column-count: 3;
-      -moz-column-gap: 0;
+      column-count: 3;
+      column-gap: 0;
       border: silver 2pt;
       border-style: none solid;
     }
     #redline {
       width: 303pt;
       border-top: 8px solid red;
       margin-top: -1in;
       position: relative;
--- a/layout/reftests/pagination/float-clear-000.html
+++ b/layout/reftests/pagination/float-clear-000.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <style type="text/css">
 .multicol {
   margin: 1em;
   border: solid silver;
   width: 300px;
-  -moz-column-width: 100px;
-  -moz-column-gap: 0;
+  column-width: 100px;
+  column-gap: 0;
   height: 100px;
 }
 
 .float {
   float: right;
   width: 15px;
   background: aqua;
   height: 250px;
--- a/layout/reftests/pagination/float-clear-000.ref.html
+++ b/layout/reftests/pagination/float-clear-000.ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <style type="text/css">
 .multicol {
   margin: 1em;
   border: solid silver;
   width: 300px;
-  -moz-column-width: 100px;
-  -moz-column-gap: 0;
+  column-width: 100px;
+  column-gap: 0;
   height: 100px;
 }
 
 .container {
   border: 15px aqua;
   border-style: none solid;
   height: 250px;
 }
--- a/layout/reftests/pagination/float-clear-001.html
+++ b/layout/reftests/pagination/float-clear-001.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <style type="text/css">
 .multicol {
   margin: 1em;
   border: solid silver;
   width: 300px;
-  -moz-column-width: 100px;
-  -moz-column-gap: 0;
+  column-width: 100px;
+  column-gap: 0;
   height: 100px;
 }
 
 .float {
   float: right;
   width: 15px;
   background: aqua;
   height: 250px;
--- a/layout/reftests/pagination/float-clear-002.html
+++ b/layout/reftests/pagination/float-clear-002.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <style type="text/css">
 .multicol {
   margin: 1em;
   border: solid silver;
   width: 300px;
-  -moz-column-width: 100px;
-  -moz-column-gap: 0;
+  column-width: 100px;
+  column-gap: 0;
   height: 100px;
 }
 
 .float {
   float: right;
   width: 15px;
   background: aqua;
   height: 250px;
--- a/layout/reftests/pagination/float-clear-003.html
+++ b/layout/reftests/pagination/float-clear-003.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <style type="text/css">
 .multicol {
   margin: 1em;
   border: solid silver;
   width: 300px;
-  -moz-column-width: 100px;
-  -moz-column-gap: 0;
+  column-width: 100px;
+  column-gap: 0;
   height: 100px;
 }
 
 .step {
   height: 10px;
   border: 15px aqua;
   border-style: none solid;
 }
--- a/layout/reftests/pagination/float-continuations-000.html
+++ b/layout/reftests/pagination/float-continuations-000.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <style type="text/css">
 
 .multicol {
   margin: 1em;
   border: solid silver;
   width: 500px;
-  -moz-column-width: 100px;
-  -moz-column-gap: 0;
+  column-width: 100px;
+  column-gap: 0;
   height: 100px;
 }
 
 div {
   margin: 2px 0;
   border: 2px white;
   border-style: solid none;
 }
--- a/layout/reftests/pagination/float-continuations-000.ref.html
+++ b/layout/reftests/pagination/float-continuations-000.ref.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <style type="text/css">
 
 .multicol {
   margin: 1em;
   border: solid silver;
   width: 500px;
-  -moz-column-width: 100px;
-  -moz-column-gap: 0;
+  column-width: 100px;
+  column-gap: 0;
   height: 100px;
   position: relative;
 }
 
 #clear {
   top: 50px;
   border-top: 4px solid orange;
   width: 100%;
--- a/layout/reftests/pagination/resize-reflow-000.html
+++ b/layout/reftests/pagination/resize-reflow-000.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Resize Reflow Test</title>
 </head>
 <body>
 
-<div style="-moz-column-width: 12em;
+<div style="column-width: 12em;
             border: silver solid;
             width: 30em" id="outer">
 x <div style="border: dotted;
               background: aqua;
               color: gray;">
         blah<br>
         blah<br>
         blah<br>
--- a/layout/reftests/pagination/resize-reflow-000.ref.html
+++ b/layout/reftests/pagination/resize-reflow-000.ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Resize Reflow Test</title>
 </head>
 <body>
 
-<div style="-moz-column-width: 12em;
+<div style="column-width: 12em;
             border: silver solid;
             width: 30em" id="outer">
   <div style="border: dotted;
               background: aqua;
               color: gray;">
         blah<br>
         blah<br>
         blah<br>
--- a/layout/reftests/pagination/resize-reflow-001.inner.html
+++ b/layout/reftests/pagination/resize-reflow-001.inner.html
@@ -4,17 +4,17 @@
   <title>Resize Reflow Test</title>
   <style>
     html, body { margin: 0; padding: 0; }
     html { overflow: hidden }
   </style>
 </head>
 <body>
 
-<div style="-moz-column-width: 12em;
+<div style="column-width: 12em;
             border: silver solid;
             height: 5em;">
   <div style="border: solid;
               background: aqua;
               color: gray;">
         blah<br>
         blah<br>
         blah<br>
--- a/layout/reftests/pagination/resize-reflow-001.ref.html
+++ b/layout/reftests/pagination/resize-reflow-001.ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Resize Reflow Test</title>
 </head>
 <body style="width: 28em">
 
-<div style="-moz-column-width: 12em;
+<div style="column-width: 12em;
             border: silver solid;
             height: 5em;">
   <div style="border: solid;
               background: aqua;
               color: gray;">
         blah<br>
         blah<br>
         blah<br>
--- a/layout/reftests/position-sticky/column-contain-1-ref.html
+++ b/layout/reftests/position-sticky/column-contain-1-ref.html
@@ -6,19 +6,19 @@
     <link rel="author" title="Corey Ford" href="mailto:cford@mozilla.com">
     <style>
       #scroll {
         overflow: hidden;
         height: 200px;
         line-height: 1;
       }
       #contain {
-        -moz-column-count: 2;
+        column-count: 2;
         column-count: 2;
-        -moz-column-rule: 1px solid black;
+        column-rule: 1px solid black;
         column-rule: 1px solid black;
         height: 200px;
         width: 200px;
       }
       #fill {
         height: 390px;
         background: blue;
       }
--- a/layout/reftests/position-sticky/column-contain-1a.html
+++ b/layout/reftests/position-sticky/column-contain-1a.html
@@ -9,19 +9,19 @@
     <meta name="assert" content="Sticky positioning with a multiple-frame containing-block element should stay contained within the bounding box of all that element's frames">
     <style>
       #scroll {
         overflow: hidden;
         height: 200px;
         line-height: 1;
       }
       #contain {
-        -moz-column-count: 2;
+        column-count: 2;
         column-count: 2;
-        -moz-column-rule: 1px solid black;
+        column-rule: 1px solid black;
         column-rule: 1px solid black;
         height: 200px;
         width: 200px;
       }
       #fill {
         height: 390px;
         background: blue;
       }
--- a/layout/reftests/position-sticky/column-contain-1b.html
+++ b/layout/reftests/position-sticky/column-contain-1b.html
@@ -9,19 +9,19 @@
     <meta name="assert" content="Sticky positioning with a multiple-frame containing-block element should stay contained within the bounding box of all that element's frames">
     <style>
       #scroll {
         overflow: hidden;
         height: 200px;
         line-height: 1;
       }
       #columns {
-        -moz-column-count: 2;
+        column-count: 2;
         column-count: 2;
-        -moz-column-rule: 1px solid black;
+        column-rule: 1px solid black;
         column-rule: 1px solid black;
         height: 200px;
         width: 200px;
       }
       #fill {
         height: 390px;
         background: blue;
       }
--- a/layout/reftests/position-sticky/column-contain-2-ref.html
+++ b/layout/reftests/position-sticky/column-contain-2-ref.html
@@ -6,19 +6,19 @@
     <link rel="author" title="Corey Ford" href="mailto:corey@coreyford.name">
     <style>
       #scroll {
         overflow: hidden;
         height: 200px;
         line-height: 1;
       }
       #columns {
-        -moz-column-count: 2;
+        column-count: 2;
         column-count: 2;
-        -moz-column-rule: 1px solid black;
+        column-rule: 1px solid black;
         column-rule: 1px solid black;
         height: 200px;
         width: 200px;
       }
       #contain {
         padding-bottom: 10px;
         border-bottom: 10px solid gray;
       }
--- a/layout/reftests/position-sticky/column-contain-2.html
+++ b/layout/reftests/position-sticky/column-contain-2.html
@@ -9,19 +9,19 @@
     <meta name="assert" content="Sticky positioning where the containing-block element has multiple frames and border/padding should stay contained within the union of the content boxes of all frames">
     <style>
       #scroll {
         overflow: hidden;
         height: 200px;
         line-height: 1;
       }
       #columns {
-        -moz-column-count: 2;
+        column-count: 2;
         column-count: 2;
-        -moz-column-rule: 1px solid black;
+        column-rule: 1px solid black;
         column-rule: 1px solid black;
         height: 200px;
         width: 200px;
       }
       #contain {
         padding-bottom: 10px;
         border-bottom: 10px solid gray;
       }
--- a/layout/reftests/table-anonymous-boxes/162063-1.xhtml
+++ b/layout/reftests/table-anonymous-boxes/162063-1.xhtml
@@ -57,17 +57,17 @@ function remove(n)
  
   <div style="display:table; border-spacing:10px; background-color:silver">
  <div style="display:table-row;">
  <div id="target8" style="display:table-caption">target</div>
  </div> 
  </div>
  
  <div style="display:table; border-spacing:10px; background-color:navy">
- <div id="target9" style="display:-moz-column">target</div>
+ <div id="target9" style="display:column">target</div>
  </div>
  
  <div style="display:table; border-spacing:10px; background-color:teal">
  <div id="target10" style="display:-moz-popup">target</div>
  </div>
  
  <div style="display:table; border-spacing:10px; background-color:Maroon">
      <math xmlns="http://www.w3.org/1998/Math/MathML" id="target11">
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-001.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-001.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-columns: [integer]</title>
+	<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"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-columns: 3;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			columns: 3;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-002.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-002.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-column-count: [integer]</title>
+	<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"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-column-count: 3;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			column-count: 3;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-003.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-003.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-columns: [width]</title>
+	<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"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-columns: 120px;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			columns: 120px;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-004.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-004.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-column-width: [width]</title>
+	<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"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-column-width: 120px;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			column-width: 120px;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-block-clip-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-block-clip-001.xht
@@ -18,18 +18,18 @@
   div
   {
   border: gray solid 1em;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
   }
 
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 0;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-block-clip-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-block-clip-002.xht
@@ -18,18 +18,18 @@
   div
   {
   border: gray solid 1em;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 0;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-br-inside-avoidcolumn-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-br-inside-avoidcolumn-001.xht
@@ -9,23 +9,23 @@
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
 html {
 	width: 800px;
 	background: white;
 }
 body {
 	background: black;
-	-moz-column-count: 3;
-	-moz-column-gap: 0;
-	-moz-column-fill: auto;
+	column-count: 3;
+	column-gap: 0;
+	column-fill: auto;
 	height: 300px;
 }
 h1 {
-	-moz-column-span: all;
+	column-span: all;
 	color: white;
 }
 div { background: red;
 	height: 150px;
 	break-inside: avoid-column;
 }
 span {
 	float: left;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-break-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-break-000.xht
@@ -21,19 +21,19 @@
   margin-bottom: 0.5em;
   font: 1.25em/1 Ahem;
   height: 3em;
   width: 10em;
   }
 
   div#test
   {
-  -moz-column-fill: auto;
-  -moz-column-gap: 0;
-  -moz-column-width: 2em;
+  column-fill: auto;
+  column-gap: 0;
+  column-width: 2em;
 
   /*
 
   N == 5;
 
   W == 2em;
 
   */
@@ -52,9 +52,9 @@
       <div>A</div>
       <div>B</div>
       <div>C</div>
   </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>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-break-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-break-001.xht
@@ -20,19 +20,19 @@
   margin-bottom: 0.5em;
   font: 1.25em/1 Ahem;
   height: 3em;
   width: 10em;
   }
 
   div#test
   {
-  -moz-column-fill: auto;
-  -moz-column-gap: 0;
-  -moz-column-width: 2em;
+  column-fill: auto;
+  column-gap: 0;
+  column-width: 2em;
 
   /*
 
   N == 5;
 
   W == 2em;
 
   */
@@ -51,9 +51,9 @@
       <div>A</div>
       <div>B</div>
       <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>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-clip-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-clip-001.xht
@@ -20,18 +20,18 @@
   background: white;
   border: gray solid 1em;
   color: blue;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 4em;
+  column-count: 3;
+  column-gap: 4em;
   }
 
   span {color: black;}
   ]]></style>
  </head>
  <body>
 
   <div>
@@ -42,9 +42,9 @@
 
     <span>
     bl ac
     </span>
     bl ue
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-clip-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-clip-002.xht
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: blue;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 4em;
+  column-count: 3;
+  column-gap: 4em;
   }
 
   span {color: black;}
   ]]></style>
  </head>
  <body>
 
   <div>
@@ -43,9 +43,9 @@
 
     <span>
 	bl ac
     </span>
 	bl ue
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-collapsing-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-collapsing-001.xht
@@ -27,18 +27,18 @@
   {
   background-color: yellow;
   color: black;
   margin: 1em;
   width: 8em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   h4
   {
   font: inherit;
   margin: 1em 0 0;
   }
   ]]></style>
@@ -48,9 +48,9 @@
     <div>
 	  <h4>ab cd</h4>
       ef gh
       ij kl
       mn oq
     </div>
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-001.xht
@@ -1,18 +1,18 @@
 <!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: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (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-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 100px 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 100px 6' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 100px 6;
-  -moz-column-gap: 0;
+  columns: 100px 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-002.xht
@@ -1,18 +1,18 @@
 <!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: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (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-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 6 100px' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 6 100px' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 6 100px;
-  -moz-column-gap: 0;
+  columns: 6 100px;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-003.xht
@@ -1,18 +1,18 @@
 <!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: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (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-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 100px auto' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 100px auto' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 100px auto;
-  -moz-column-gap: 0;
+  columns: 100px auto;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-004.xht
@@ -1,18 +1,18 @@
 <!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: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (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-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: auto 100px' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: auto 100px' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: auto 100px;
-  -moz-column-gap: 0;
+  columns: auto 100px;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-005.xht
@@ -1,18 +1,18 @@
 <!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: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (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-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties. '-moz-columns: 6' is equivalent to '-moz-column-width: auto' and '-moz-column-count: 6'." />
+  <meta name="assert" content="This test checks that 'columns: 6' shorthand correctly set 'column-width' and 'column-count' properties. 'columns: 6' is equivalent to 'column-width: auto' and 'column-count: 6'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 6;
-  -moz-column-gap: 0;
+  columns: 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-006.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-006.xht
@@ -1,18 +1,18 @@
 <!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: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (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-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 6 auto' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 6 auto' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 6 auto;
-  -moz-column-gap: 0;
+  columns: 6 auto;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-007.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-007.xht
@@ -1,18 +1,18 @@
 <!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: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (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-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: auto 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: auto 6' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: auto 6;
-  -moz-column-gap: 0;
+  columns: auto 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-001.xht
@@ -1,18 +1,18 @@
 <!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: invalid -moz-columns shorthand</title>
+  <title>CSS Multi-column Layout Test: invalid columns shorthand</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-26 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that '-moz-columns: 8 normal' is invalid (generating a parsing error) and therefore will be ignored." />
+  <meta name="assert" content="This test checks that 'columns: 8 normal' is invalid (generating a parsing error) and therefore will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
-  -moz-columns: 8 normal;
+  column-count: 4;
+  column-gap: 0;
+  columns: 8 normal;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
@@ -40,9 +40,9 @@
     bl ue
     </span>
     <span>
     bl ue
     </span>
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-002.xht
@@ -4,23 +4,23 @@
 
   <!--
   Original, initial filename of this test was
   multicol-columns-toolong-002.xht
   and it should be filename-renamed
   multicol-columns-invalid-002.xht
   -->
 
-  <title>CSS Multi-column Layout Test: invalid -moz-columns shorthand</title>
+  <title>CSS Multi-column Layout Test: invalid columns shorthand</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-26 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that '-moz-columns: 8 auto 6em' is invalid (generating a parsing error) and therefore will be ignored." />
+  <meta name="assert" content="This test checks that 'columns: 8 auto 6em' is invalid (generating a parsing error) and therefore will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -28,19 +28,19 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
-  -moz-columns: 8 auto 6em;
+  column-count: 4;
+  column-gap: 0;
+  columns: 8 auto 6em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-toolong-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-toolong-001.xht
@@ -1,15 +1,15 @@
 <!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: narrower inline content inside wider colum box</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-26 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-invalid-001-ref.xht"/>
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks the rendering of inline content (2em) inside wider (3em) column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
@@ -39,9 +39,9 @@
     bl ue
     </span>
     <span>
     bl ue
     </span>
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-containing-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-containing-001.xht
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 0;
+  column-count: 3;
+  column-gap: 0;
   }
 
   span
   {
   color: red;
   position: absolute;
   top: -1em;
   }
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-containing-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-containing-002.xht
@@ -17,18 +17,18 @@
   div
   {
   background-color: white;
   color: green;
   font: 1.25em/1 Ahem;
   position: relative;
   width: 19em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
   }
 
   span {color: red;}
 
   img#white-overlapping
   {
   left: 11em;
   position: absolute;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-001.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-count (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count (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-07-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that setting '-moz-column-count' should accordingly create 6 column boxes. In this test, each column box should be exactly 100px wide." />
+  <meta name="assert" content="This test checks that setting 'column-count' should accordingly create 6 column boxes. In this test, each column box should be exactly 100px wide." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 6;
-  -moz-column-gap: 0;
+  column-count: 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-002.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-count (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count (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-07-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that setting '-moz-column-count' should accordingly create 4 column boxes. In this test, each column box should be exactly 5em wide." />
+  <meta name="assert" content="This test checks that setting 'column-count' should accordingly create 4 column boxes. In this test, each column box should be exactly 5em wide." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   html {background-color: white;}
@@ -25,18 +25,18 @@
   width: 20em;
   }
 
   div
   {
   background-color: yellow;
   color: black;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1 333 55555 55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1 22&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-001.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
 <link rel="match" href="multicol-count-computed-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
@@ -25,21 +25,21 @@ div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 12em;
 	widows: 1;
 	orphans: 1;
 
-	-moz-column-count: 3;
-	-moz-column-gap: 6em;
-	-moz-column-rule-color: blue;
-	-moz-column-rule-width: 1.5em;
-	-moz-column-rule-style: solid;
+	column-count: 3;
+	column-gap: 6em;
+	column-rule-color: blue;
+	column-rule-width: 1.5em;
+	column-rule-style: solid;
 }
 #pink {color: pink;}
 #orange {color: orange;}
 #purple {color: purple;}
 #grey {color: grey;}
 ]]></style>
 </head>
 
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-002.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
 <link rel="match" href="multicol-count-computed-2-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
@@ -25,21 +25,21 @@ div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 12em;
 	widows: 1;
 	orphans: 1;
 
-	-moz-column-count: 3;
-	-moz-column-gap: 7em;
-	-moz-column-rule-color: red;
-	-moz-column-rule-width: 1.5em;
-	-moz-column-rule-style: solid;
+	column-count: 3;
+	column-gap: 7em;
+	column-rule-color: red;
+	column-rule-width: 1.5em;
+	column-rule-style: solid;
 }
 #pink {color: pink;}
 #orange {color: orange;}
 #purple {color: purple;}
 #grey {color: grey;}
 ]]></style>
 </head>
 
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-003.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-rule and overflow inside (complex test)</title>
+  <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 -moz-columns" />
+  <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 be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st -moz-column-rule." />
+  <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 be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st column-rule." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,64 +20,64 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 13em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 5em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1.5em;
+  column-count: 3;
+  column-gap: 5em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.5em;
   }
 
   /*
-  (11)  if (-moz-column-width = auto) and (-moz-column-count != auto) then
-  (12)    N := -moz-column-count;
-  (13)    W := max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  (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 -moz-column-count in this test is 3.
+  So, the used column-count in this test is 3.
 
-  W := max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  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 -moz-column-width in this test is 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 in the normal flow that extends into
   column gaps (e.g., long words or images) is
   clipped in the middle of the column gap.
   "
   http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements
   this causes the right-half (0.5em) of the 'K' glyph to
-  be overlapped by the right-half (0.75em) of the 1st blue -moz-column-rule.
+  be overlapped by 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 -moz-columns that
+  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>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-004.xht
@@ -1,18 +1,18 @@
 <!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: both '-moz-column-width' and '-moz-column-count' are 'auto'</title>
+  <title>CSS Multi-column Layout Test: both 'column-width' and 'column-count' are 'auto'</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/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
   <link rel="match" href="multicol-count-computed-004-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that if '-moz-column-width' is 'auto' and if '-moz-column-count' is 'auto', then such element will not behave like a multi-column element and -moz-column-gap and -moz-column-rule declarations will be ignored." />
+  <meta name="assert" content="This test checks that if 'column-width' is 'auto' and if 'column-count' is 'auto', then such element will not behave like a multi-column element and column-gap and column-rule declarations will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,21 +20,21 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: auto;
-  -moz-column-gap: 7em;
-  -moz-column-rule-color: red;
-  -moz-column-rule-width: 1.5em;
-  -moz-column-rule-style: solid;
+  column-count: auto;
+  column-gap: 7em;
+  column-rule-color: red;
+  column-rule-width: 1.5em;
+  column-rule-style: solid;
   }
 
   #pink {color: pink;}
   #orange {color: orange;}
   #purple {color: purple;}
   #gray {color: gray;}
   ]]></style>
  </head>
@@ -44,9 +44,9 @@
   <div>
 	<span id="pink">Pink</span>
 	<span id="orange">oran</span>
 	<span id="purple">PurP</span>
 	<span id="gray">gray</span>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-005.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-rule and overflow inside (complex test)</title>
+  <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 -moz-columns" />
+  <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 be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st -moz-column-rule." />
+  <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 be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st column-rule." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,68 +20,68 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 13em;
 
-  -moz-column-gap: 5em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1.5em;
-  -moz-column-width: 1em;
+  column-gap: 5em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.5em;
+  column-width: 1em;
   }
 
   /*
-  (15)  if (-moz-column-width != auto) and (-moz-column-count = auto) then
-  (16)    N := max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
-  (17)    W := ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  (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 + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
+  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 -moz-column-count in this test is 3.
+  So, the used column-count in this test is 3.
 
-  W := ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  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 -moz-column-width in this test is 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 in the normal flow that extends into
   column gaps (e.g., long words or images) is
   clipped in the middle of the column gap.
   "
   http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements
   this causes the right-half (0.5em) of the 'K' glyph to
-  be overlapped by the right-half (0.75em) of the 1st blue -moz-column-rule.
+  be overlapped by 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 -moz-columns that
+  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>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-2-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-2-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-001.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-count</title>
+<title>multicolumn | column-count</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
 <link rel="match" href="multicol-count-large-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -21,18 +21,18 @@ body>div {
 	color: red;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 12em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 1000;
-	-moz-column-gap: 0;
+	column-count: 1000;
+	column-gap: 0;
 }
 span {
 	color: black;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-002.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-count</title>
+<title>multicolumn | column-count</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
 <link rel="match" href="multicol-count-large-2-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -21,18 +21,18 @@ body>div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 12em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 1000;
-	-moz-column-gap: 0;
+	column-count: 1000;
+	column-gap: 0;
 }
 span {
 	color: blue;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-2-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-2-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-count</title>
+<title>multicolumn | column-count</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body>div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;
 	background: yellow;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-count</title>
+<title>multicolumn | column-count</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body>div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;
 	background: yellow;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-001.xht
@@ -1,18 +1,18 @@
 <!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: negative '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: negative 'column-count' value</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-30 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified negative '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified negative 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: -1;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: -1;
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
@@ -43,9 +43,9 @@
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-002.xht
@@ -1,18 +1,18 @@
 <!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: zero '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: zero 'column-count' value</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-30 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified 0 '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified 0 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 0; /* invalid; must be a greater-than-zero integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 0; /* invalid; must be a greater-than-zero integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
@@ -43,9 +43,9 @@
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-001.xht
@@ -1,18 +1,18 @@
 <!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: non-integer '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: non-integer 'column-count' value</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '&lt;integer&gt;' type" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified real 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 2.1; /* invalid; must be an integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 2.1; /* invalid; must be an integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
@@ -43,9 +43,9 @@
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-002.xht
@@ -1,18 +1,18 @@
 <!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: non-integer '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: non-integer 'column-count' value</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '&lt;integer&gt;' type" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified real 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 1.9; /* invalid; must be an integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 1.9; /* invalid; must be an integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
@@ -43,9 +43,9 @@
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-003.xht
@@ -1,18 +1,18 @@
 <!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: non-integer '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: non-integer 'column-count' value</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '&lt;integer&gt;' type" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified real 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 2.0; /* invalid; must be an integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 2.0; /* invalid; must be an integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
@@ -43,9 +43,9 @@
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-000.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-fill: balance (basic)</title>
+  <title>CSS Multi-column Layout Test: column-fill: balance (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that content is balanced into all -moz-columns thanks to '-moz-column-fill: balance'." />
+  <meta name="assert" content="This test checks that content is balanced into all columns thanks to 'column-fill: balance'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div.test, table#reference
@@ -21,19 +21,19 @@
   color: lime;
   margin: 1em 0em;
   font: 1.25em/1 Ahem;
   width: 18em;
   }
 
   div.test
   {
-  -moz-columns: 3;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  columns: 3;
+  column-fill: balance;
+  column-gap: 0em;
 
   /*
 
   N == 3;
 
   W == 6em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-001.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-fill: balance with set height (basic)</title>
+  <title>CSS Multi-column Layout Test: column-fill: balance with set height (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that content is balanced into all -moz-columns of a multi-column element with a set height thanks to '-moz-column-fill: balance'." />
+  <meta name="assert" content="This test checks that content is balanced into all columns of a multi-column element with a set height thanks to 'column-fill: balance'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#test, table#reference
@@ -22,19 +22,19 @@
   font: 1.25em/1 Ahem;
   height: 5em;
   margin: 1em 0em;
   width: 20em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  columns: 2;
+  column-fill: balance;
+  column-gap: 0em;
 
   /*
 
   N == 2;
 
   W == 10em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-001.xht
@@ -1,37 +1,37 @@
 <!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: '-moz-column-fill: auto' (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: auto' (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-07-30 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-auto-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-fill: auto' fills the column boxes of a multi-colum element sequentially with inline content and does not bother about balancing content of column boxes." />
+  <meta name="assert" content="This test checks that 'column-fill: auto' fills the column boxes of a multi-colum element sequentially with inline content and does not bother about balancing content of column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   color: black;
   font: 1.25em/1 Ahem;
   height: 10em;
   orphans: 1;
   widows: 1;
   width: 32em;
 
-  -moz-column-count: 3;
-  -moz-column-fill: auto;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-fill: auto;
+  column-gap: 1em;
   }
   ]]></style>
  </head>
 
  <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>
 
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-fill-auto</title>
+<title>multicolumn | column-fill-auto</title>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: auto;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: auto;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002.xht
@@ -1,14 +1,14 @@
 <!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 | -moz-column-fill-auto</title>
-<meta name="assert" content="This test checks that -moz-columns are not balanced when '-moz-column-fill: auto' is set"/>
+<title>multicolumn | column-fill-auto</title>
+<meta name="assert" content="This test checks that columns are not balanced when 'column-fill: auto' is set"/>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
 <link rel="match" href="multicol-fill-auto-002-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -23,19 +23,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: auto;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: auto;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-003.xht
@@ -1,17 +1,17 @@
 <!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: '-moz-column-fill: auto' (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: auto' (basic)</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-01 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-auto-003-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks if inline content fills column boxes sequentially when '-moz-column-fill' is set to 'auto'." />
+  <meta name="assert" content="This test checks if inline content fills column boxes sequentially when 'column-fill' is set to 'auto'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,20 +20,20 @@
   background-repeat: no-repeat;
   background-position: 2em 4em;
   border: green solid 1em;
   color: green;
   font: 1.25em/1 Ahem;
   height: 6em;
   width: 21em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: auto;
-  -moz-column-gap: 1em;
-  -moz-column-rule: yellow solid 1em;
+  column-count: 2;
+  column-fill: auto;
+  column-gap: 1em;
+  column-rule: yellow solid 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is <strong>no red</strong>.</p>
 
@@ -50,16 +50,16 @@ 123 56 890 123 56</div>
   |123 56 890|  |          |
   |123 56789 |  |          |
   |1 34567 90|  |          |
   |12 4567 90|  |          |
   ************  ************
 
   The digits are the green squares, the white squares
   are the blank white spaces. The yellow vertical stripe
-  represent both the -moz-column-gap and the -moz-column-rule.
+  represent both the column-gap and the column-rule.
   The "3" glyph at line 5 of 1st column box should be
   overlapping the red square.
 
   -->
 
  </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-001.xht
@@ -1,31 +1,31 @@
 <!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 | -moz-column-span: all | -moz-column-fill: auto</title>
+<title>multicol | column-span: all | column-fill: auto</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
 <link rel="match" href="multicol-fill-auto-block-children-ref.xht"/>
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
 html {
 	background: white;
 }
 body {
 	background: blue;
 	width: 1200px;
 	height: 492px;
-	-moz-column-count: 3;
-	-moz-column-gap: 2em;
-	-moz-column-fill: auto;
+	column-count: 3;
+	column-gap: 2em;
+	column-fill: auto;
 }
 h1 {
-	-moz-column-span: all;
+	column-span: all;
 	font-size: 2em;
 	height: 70px;
 }
 dl {
 	font-size: 70%;
 	color: blue;
 	padding: 5px 10px 3px;
 	margin: 0 0 15px;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-002.xht
@@ -1,44 +1,44 @@
 <!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: '-moz-column-fill: auto' and '-moz-column-span: all' (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: auto' and 'column-span: all' (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-16 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pagination-and-overflow-outside-multicol" title="8.2. Pagination and overflow outside multicol elements" />
   <link rel="match" href="multicol-fill-auto-block-children-002-ref.xht" />
 
   <meta name="flags" content="" />
-  <meta name="assert" content="This test checks that if '-moz-column-fill' is set to 'auto' and a multicolumn element content is solely made of block container boxes, then it should fill column boxes sequentially with such content and, in this test, it should overflow outside of it. This test relies on the idea that a '-moz-column-span: all' element will occupy more space in a multi-column element than a '-moz-column-span: none' element, therefore reducing available space for content in column boxes." />
+  <meta name="assert" content="This test checks that if 'column-fill' is set to 'auto' and a multicolumn element content is solely made of block container boxes, then it should fill column boxes sequentially with such content and, in this test, it should overflow outside of it. This test relies on the idea that a 'column-span: all' element will occupy more space in a multi-column element than a 'column-span: none' element, therefore reducing available space for content in column boxes." />
   <style type="text/css"><![CDATA[
   html {background-color: white;}
 
   body
   {
   background-color: blue;
   height: 200px;
   margin: 8px;
   width: 680px;
 
-  -moz-column-count: 3;
-  -moz-column-fill: auto;
-  -moz-column-gap: 10px;
+  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
   {
   color: white;
-  -moz-column-span: all;
+  column-span: all;
   font-size: 2em;
   line-height: 1.25; /* or 1.21875 to achieve a 39px tall line box */
   margin: 21px 0em;
   /*
    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
  ====================================
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-span: all | -moz-column-fill: auto</title>
+<title>multicol | column-span: all | column-fill: auto</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 html {
 	background: white;
 }
 body {
 	background: blue;
 	width: 1200px;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto.xht
@@ -1,14 +1,14 @@
 <!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 | -moz-column-fill-auto</title>
-<meta name="assert" content="This test checks that -moz-columns are properly balanced when '-moz-column-fill: auto' is set"/>
+<title>multicolumn | column-fill-auto</title>
+<meta name="assert" content="This test checks that columns are properly balanced when 'column-fill: auto' is set"/>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
 <link rel="match" href="multicol-fill-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -23,19 +23,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: auto;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: auto;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-fill</title>
+<title>multicolumn | column-fill</title>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: balance;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: balance;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001.xht
@@ -1,14 +1,14 @@
 <!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 | -moz-column-fill</title>
-<meta name="assert" content="This test checks that -moz-columns are properly balanced when '-moz-column-fill: balance' is set"/>
+<title>multicolumn | column-fill</title>
+<meta name="assert" content="This test checks that columns are properly balanced when 'column-fill: balance' is set"/>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
 <link rel="match" href="multicol-fill-balance-001-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -23,19 +23,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: balance;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: balance;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-gap</title>
+<title>multicolumn | column-gap</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 div {
 	background: yellow;
 	height: 5em;
 	width: 30em;
 }
 ]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-000.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-gap (basic)</title>
+  <title>CSS Multi-column Layout Test: column-gap (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 'column-gap'" />
   <link rel="match" href="multicol-gap-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that column gap appears between two -moz-columns." />
+  <meta name="assert" content="This test checks that column gap appears between two columns." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -23,18 +23,18 @@
   }
 
   div#test
   {
   background-color: yellow;
   orphans: 1;
   widows: 1;
 
-  -moz-column-width: 10em;
-  -moz-column-gap: 10em;
+  column-width: 10em;
+  column-gap: 10em;
   }
 
   span {color: yellow;}
   ]]></style>
  </head>
  <body>
 
   <p>Test passes if the 2 horizontal bars are <strong>identical</strong>.</p>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-gap: normal'</title>
+  <title>CSS Multi-column Layout Test: 'column-gap: normal'</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-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-001-ref.xht" />
   <meta name="flags" content="ahem may" />
   <meta name="assert" content="This test checks that the 'normal' column gap is 1em, which is suggested -- and not prescribed -- by the specification." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -23,22 +23,22 @@
   margin: 1em;
   orphans: 1;
   widows: 1;
   width: 3em;
   }
 
   div.multicol
   {
-  -moz-column-gap: normal;
-  -moz-column-width: 1em;
+  column-gap: normal;
+  column-width: 1em;
   }
 
   span {padding-right: 1em;}
   ]]></style>
  </head>
  <body>
   <p>Test passes if the 2 stripes are <strong>identical</strong>.</p>
 
   <div class="multicol">x<br />x</div>
   <div><span>x</span>x</div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-002.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-gap (basic)</title>
+  <title>CSS Multi-column Layout Test: column-gap (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-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
 	bl ac
@@ -38,9 +38,9 @@
 	bl ue
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-003.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-gap: normal'</title>
+  <title>CSS Multi-column Layout Test: 'column-gap: normal'</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-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-002-ref.xht" />
   <meta name="flags" content="ahem may" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: normal;
+  column-count: 4;
+  column-gap: normal;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
 	bl ac
@@ -38,9 +38,9 @@
 	bl ue
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-fraction-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-fraction-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-gap' with increasing values</title>
+  <title>CSS Multi-column Layout Test: 'column-gap' with increasing values</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-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-fraction-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -17,25 +17,25 @@
   div
   {
   background-color: gray;
   font: 1.25em/1 Ahem;
   width: 14.5em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 0.5em;
+  column-count: 2;
+  column-gap: 0.5em;
   }
 
-  #two {-moz-column-gap: 2.5em;}
+  #two {column-gap: 2.5em;}
 
-  #three {-moz-column-gap: 4.5em;}
+  #three {column-gap: 4.5em;}
 
-  #four {-moz-column-gap: 6.5em;}
+  #four {column-gap: 6.5em;}
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
 
   <div id="one">
 	blac
@@ -53,9 +53,9 @@
   </div>
 
   <div id="four">
 	blac
 	<span>blue</span>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-001.xht
@@ -1,18 +1,18 @@
 <!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: '-moz-column-gap' with large value</title>
+  <title>CSS Multi-column Layout Test: 'column-gap' with large value</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-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap" />
+  <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 '-moz-column-gap' is large and when used '-moz-column-width' is narrow, then content extends into -moz-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 until its middle and content can extend, overflow outside the edges of the multi-colum element if 'overflow' is set to 'visible'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,31 +20,31 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 4em;
+  column-count: 4;
+  column-gap: 4em;
 
   /*
   N == 4;
   W == 0em;
   */
 
   /*
   In this test, the content of first 3 column
-  boxes extend into middle of -moz-column-gap and
+  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
-  -moz-column-gap.
+  column-gap.
   */
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-002.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-gap' with large value</title>
+  <title>CSS Multi-column Layout Test: 'column-gap' with large value</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-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap" />
+  <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-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 4em;
+  column-count: 2;
+  column-gap: 4em;
 
   /*
   N == 2;
   W == 3.5em;
   */
   }
 
   span {color: blue;}
@@ -43,9 +43,9 @@
   bl ue
   </span>
   <span>
   bl ue
   </span>
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-negative-001.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-gap with negative value</title>
+  <title>CSS Multi-column Layout Test: column-gap with negative value</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-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-002-ref.xht" />
   <meta name="flags" content="ahem invalid" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,19 +19,19 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-gap: -1em;
+  column-count: 4;
+  column-gap: 1em;
+  column-gap: -1em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
 	bl ac
@@ -39,9 +39,9 @@
 	bl ue
   </span>
   <span>
 	bl ue
   </span>
 	bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-height-001.xht
@@ -1,42 +1,42 @@
 <!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: -moz-column-count and height</title>
+  <title>CSS Multi-column Layout Test: column-count and height</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-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-height-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that length of column rules is equal to the length of the -moz-columns and if a nth column box overflows outside the available width of a multi-column element, then an (n-1)th column rule should be drawn. In this test, a 3rd column box is created outside the content edge of the multi-column element: therefore, a 2nd blue column rule should be drawn accordingly." />
+  <meta name="assert" content="This test checks that length of column rules is equal to the length of the columns and if a nth column box overflows outside the available width of a multi-column element, then an (n-1)th column rule should be drawn. In this test, a 3rd column box is created outside the content edge of the multi-column element: therefore, a 2nd blue column rule should be drawn accordingly." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   color: white;
   font: 1.25em/1 Ahem;
   height: 8em;
   width: 14em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: auto;
-  -moz-column-gap: 2em;
-  -moz-column-rule: blue solid 10px;
+  column-count: 2;
+  column-fill: auto;
+  column-gap: 2em;
+  column-rule: blue solid 10px;
   }
   ]]></style>
  </head>
  <body>
   <p>Test passes if there are 2 blue vertical stripes of equal height.</p>
 
   <div>
   1st col 1st col 1st col
   1st col 2nd col 2nd col
   2nd col 2nd col 3rd col
   3rd col 3rd col 3rd col
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-height-block-child-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-height-block-child-001.xht
@@ -18,40 +18,40 @@
   <style type="text/css"><![CDATA[
   div
   {
   background-color: blue;
   font: 20px/1 Ahem;
   height: 8em;
   width: 14em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 2em;
+  column-count: 2;
+  column-gap: 2em;
 
   /*
 
   N == 2;
 
   W == 6em;
 
   H == 8em;
 
   */
   }
 
   div#outer
   {
   color: black;
-  -moz-column-fill: auto;
+  column-fill: auto;
   }
 
   div#inner
   {
   color: orange;
-  -moz-column-fill: balance;
+  column-fill: balance;
   }
   ]]></style>
  </head>
  <body>
 
   <div id="outer">
   bla bla bla bla bla
 
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-001-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-001-ref.xht
@@ -16,20 +16,20 @@
   }
 
   img
   {
   padding-right: 1em;
   vertical-align: top;
   }
 
-  img.-moz-column-gap {margin-right: 2em;}
+  img.column-gap {margin-right: 2em;}
 
   img#last {padding-right: 0em;}
   ]]></style>
  </head>
  <body>
 
-  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
+  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
 width="40" height="60" alt="Image download support must be enabled" /><img id="last" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-001.xht
@@ -17,18 +17,18 @@
   body
   {
   font: 1.25em/1 Ahem;
   width: 34em;
   }
 
   body > div
   {
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
 
   /*
   N == 3;
 
     34em : available width
   -  2em : horizontal margin of external div
   -  2em : 2 column gaps
  ==========
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002-ref.xht
@@ -12,28 +12,28 @@
   font: 1.25em/1 serif;
   margin: 1em;
   padding: 0em 1em 1em;
   width: 30em;
   }
 
   img {vertical-align: top;}
 
-  img.-moz-column-gap
+  img.column-gap
   {
   margin-left: -2em;
   margin-right: 3em;
   vertical-align: bottom;
   }
 
   img#last
   {
   margin-left: -2em;
   vertical-align: bottom;
   }
   ]]></style>
  </head>
  <body>
 
-  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="-moz-column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="-moz-column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img id="last" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /></div>
+  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img id="last" 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>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002.xht
@@ -1,31 +1,31 @@
 <!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: '-moz-column-count' and inherit</title>
+  <title>CSS Multi-column Layout Test: 'column-count' and inherit</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/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <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="match" href="multicol-inherit-002-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' can be inherited by setting it with the CSS-wide keyword 'inherit'." />
+  <meta name="assert" content="This test checks that 'column-count' can be inherited by setting it with the CSS-wide keyword 'inherit'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
   background-color: blue;
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   font: 1.25em/1 Ahem;
   width: 32em;
 
   /*
   N == 3;
 
     32em
   -  2em : 2 column gaps
@@ -49,18 +49,18 @@
   margin: 1em;
   orphans: 1;
   widows: 1;
   }
 
   div > div
   {
   background-color: yellow;
-  -moz-column-count: inherit;
-  -moz-column-gap: 1em;
+  column-count: inherit;
+  column-gap: 1em;
   }
 
   div > div:first-child {margin-top: 0;}
   ]]></style>
  </head>
  <body>
 
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-003.xht
@@ -14,17 +14,17 @@
 }
 ]]></style>
 <style type="text/css"><![CDATA[
 body {
 	width: 75em;
 }
 body>div {
 	height: 2em;
-	-moz-column-width: 8em;
+	column-width: 8em;
 }
 div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;
 	background: yellow;
 	orphans: 1;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-004.xht
@@ -11,30 +11,30 @@
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
 <style type="text/css"><![CDATA[
 body>div {
 	width: 74em;
-	-moz-column-rule: 1em solid blue;
+	column-rule: 1em solid blue;
 }
 div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: white;
 	background: white;
 	margin: 1em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 3;
-	-moz-column-gap: 7em;
+	column-count: 3;
+	column-gap: 7em;
 }
 ]]></style>
 </head>
 
 <body>
 
 <div>
 	<div>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-list-item-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-list-item-001.xht
@@ -18,18 +18,18 @@
   ul
   {
   background-color: black;
   font: 1.25em/1 Ahem;
   margin: 0em;
   padding: 0em;
   width: 10em;
 
-  -moz-column-gap: 0em;
-  -moz-column-width: 5em;
+  column-gap: 0em;
+  column-width: 5em;
   }
 
   li, span {font-size: 1em;}
 
   li
   {
   margin-left: 1em;
   padding: 0em;
@@ -50,9 +50,9 @@
 	<li><span>6tli</span></li>
 	<li>7tli</li>
 	<li>8tli</li>
 	<li>9tli</li>
 	<li>10tl</li>
   </ul>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-001.xht
@@ -2,36 +2,36 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: multi-column and margin collapsing of first child (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-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" />
   <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 -moz-column-fill: auto) does not collapse with its parent." />
+  <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[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#test-multi-column-red
   {
   background-color: red;
   color: white;
   font: 3.125em/1 Ahem; /* equivalent to 50px/50px Ahem */
   height: 4em;
   margin-top: 0em;
   width: 4em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: auto;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-fill: auto;
+  column-gap: 0em;
   }
 
   div#first-child {margin-top: 2em;}
 
   div#reference-overlapping-green
   {
   background-color: green;
   bottom: 200px;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-002.xht
@@ -2,36 +2,36 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: multi-column and margin collapsing of first child (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-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" />
   <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 -moz-column-fill: balance) does not collapse with its parent." />
+  <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[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#test-multi-column-red
   {
   background-color: red;
   color: white;
   font: 3.125em/1 Ahem; /* equivalent to 50px/50px Ahem */
   height: 4em;
   margin-top: 0em;
   width: 4em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-fill: balance;
+  column-gap: 0em;
   }
 
   span
   {
   display: inline-block;
   margin-top: 2em;
   }
 
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-child-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-margin-child-001.xht
@@ -18,19 +18,19 @@
   div
   {
   background-color: yellow;
   border: gray solid 1em;
   color: blue;
   font: 1.25em/1 Ahem;
   width: 10em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-fill: balance;
+  column-gap: 0em;
   }
 
   h4
   {
   font: inherit;
   margin: 1em 0;
   }
   ]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-002.xht
@@ -17,30 +17,30 @@
   <style type="text/css"><![CDATA[
   body {margin: 0em;}
 
   body > div
   {
   font: 1.25em/1 Ahem;
   width: 32em;
 
-  -moz-column-gap: 1em;
-  -moz-column-width: 8em;
+  column-gap: 1em;
+  column-width: 8em;
   }
 
   /*
 
-  N == max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
+  N == max(1, floor((available-width + column-gap) / (column-width + column-gap)));
   N == max(1, floor((32em + 1em) / (8em + 1em)));
   N == max(1, floor(33em / 9em));
   N == max(1, floor(3.6));
   N == max(1, 3);
   N == 3;
 
-  W == ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  W == ((available-width + column-gap) / N) - column-gap;
   W == ((32em + 1em) / 3) - 1em;
   W == (33em / 3) - 1em;
   W == (11em) - 1em;
   W == 10em;
 
   */
 
   div
@@ -78,9 +78,9 @@
 		Pi nk
 		Pi nk
 		Pi nk
 		Pi nk
 	</div>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005-ref.xht
@@ -16,20 +16,20 @@
   }
 
   img
   {
   padding-right: 2em;
   vertical-align: top;
   }
 
-  img.-moz-column-gap {margin-right: 2em;}
+  img.column-gap {margin-right: 2em;}
 
   img#last {padding-right: 0em;}
   ]]></style>
  </head>
  <body>
 
-  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
+  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
 width="40" height="60" alt="Image download support must be enabled" /><img id="last" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005.xht
@@ -18,26 +18,26 @@
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
-  -moz-column-gap: 1em;
+  column-gap: 1em;
   font: 1.25em/1 Ahem;
   width: 41em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
   The height of column rule depends on number of line boxes in
@@ -47,17 +47,17 @@
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   So, each duo of 'a', 'm' and 'x' should fill one and only 1 line
@@ -73,17 +73,17 @@
   {
   background-color: yellow;
   color: black;
   font-size: 1em;
   margin: 1em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
+  column-count: 3;
   }
 
   div > div:first-child {margin-top: 0;}
   ]]></style>
  </head>
 
  <body>
 
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-column-rule-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-column-rule-001.xht
@@ -1,80 +1,80 @@
 <!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>
   <!--
   This test's original filename was multicol-inherit-004.xht
   and it has been modified and is now
   multicol-nested-column-rule-001.xht
   -->
-  <title>CSS Multi-column Layout Test: nested multi-columns and -moz-column-rule position</title>
+  <title>CSS Multi-column Layout Test: nested multi-columns and column-rule position</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-09 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
   <link rel="match" href="multicol-nested-column-rule-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks how the height of column boxes conditions the height of column rule." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
-  -moz-column-rule: blue solid 1em;
+  column-rule: blue solid 1em;
   font: 1.25em/1 Ahem;
   width: 42em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  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;
 
-  So, the first -moz-column-rule should be at:
+  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 -moz-column-rule
+    1.0em : (3.0em / 2) - (1.0em / 2) : left edge of 1st column-rule
   =========
    14.0em
 
-  The 2nd -moz-column-rule should be at:
+  The 2nd column-rule should be at:
 
     1.0em : margin-left of outer div
    12.0em : width of 1st column box
-    3.0em : first -moz-column-gap
+    3.0em : first column-gap
    12.0em : width of 2nd column box
-    1.0em : (3.0em / 2) - (1.0em / 2) : left edge of 2nd -moz-column-rule
+    1.0em : (3.0em / 2) - (1.0em / 2) : left edge of 2nd column-rule
   =========
    29.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
    -
      2em : horizontal margin of each div inside
    =======
     10em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  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, 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
@@ -90,18 +90,18 @@
   {
   background-color: white;
   color: white;
   font-size: 1em;
   margin: 0em 1em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 3em;
+  column-count: 3;
+  column-gap: 3em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>
 	<div>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-001.xht
@@ -17,25 +17,25 @@
   <style type="text/css"><![CDATA[
   body {margin: 0em;}
 
   body > div
   {
   font: 1.25em/1 Ahem;
   width: 32em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   /*
 
   N == 3;
 
-  W == ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  W == ((available-width + column-gap) / N) - column-gap;
   W == ((32em + 1em) / 3) - 1em;
   W == (33em / 3) - 1em;
   W == (11em) - 1em;
   W == 10em;
 
   */
 
   div
@@ -74,9 +74,9 @@
 		bl ue
 		bl ue
 		bl ue
 		bl ue
 	</div>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-002.xht
@@ -1,12 +1,12 @@
 <!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: nested multi-moz-columns and vertical margin (complex)</title>
+  <title>CSS Multi-column Layout Test: nested multicolumns and vertical margin (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-14 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model" title="2. The multi-column model" />
   <link rel="match" href="multicol-nested-margin-002-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that when an inner nested multi-column element is preceded by a soft column break (caused by an unforced column-break), then the used margin-top of such inner nested multi-column element is '0'." />
 
   <!--
@@ -36,33 +36,33 @@
 
   div
   {
   color: yellow;
   font: inherit;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   div div {margin: 0em 1em;}
 
   div div:last-child
   {
   color: blue;
   margin: 1em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
   The height of column rule depends on number of line boxes in
@@ -72,17 +72,17 @@
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   So, each duo of 'a', 'm' and 'x' should fill one and only 1
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-003.xht
@@ -28,43 +28,43 @@
   div
   {
   background-color: yellow;
   color: black;
   margin: 1em 1em 0;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   /*
 
   N == 3;
 
   43em - 2em (horizontal margins) == available-width
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-004.xht
@@ -28,47 +28,47 @@
   div
   {
   background: yellow;
   color: black;
   margin: 1em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   div div {margin: 0 1em;}
 
   div div:first-child {margin: 1em 1em 0;}
 
   /*
 
   N == 3;
 
   43em - 2em (horizontal margins) == available-width
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-005.xht
@@ -28,45 +28,45 @@
   div
   {
   background: yellow;
   color: black;
   margin: 1em 1em 0em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   div div {margin: 0 1em;}
 
   div div:first-child {margin: 1em 1em 0;}
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-overflow-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-overflow-000.xht
@@ -2,17 +2,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: multi-column with set height causing overflow outside (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pagination-and-overflow-outside-multicol" title="8.2. Pagination and overflow outside multicol elements" />
   <link rel="match" href="multicol-overflow-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that column gap appears between two -moz-columns." />
+  <meta name="assert" content="This test checks that column gap appears between two columns." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div, table
@@ -20,19 +20,19 @@
   background-color: yellow;
   color: lime;
   font: 1.25em/1 Ahem;
   margin: 1em 0;
   }
 
   div
   {
-  -moz-columns: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0px;
+  columns: 2;
+  column-fill: balance;
+  column-gap: 0px;
   height: 2em;
   width: 20em;
   }
 
   table
   {
   border-right: lime solid 1em;
   border-spacing: 0px;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-overflowing-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-overflowing-001.xht
@@ -21,30 +21,30 @@
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
   font: 1.25em/1 Ahem;
   height: 2em;
   width: 32em;
 
-  -moz-column-gap: 1em;
-  -moz-column-width: 8em;
+  column-gap: 1em;
+  column-width: 8em;
   }
 
   /*
 
-  N == max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
+  N == max(1, floor((available-width + column-gap) / (column-width + column-gap)));
   N == max(1, floor((32em + 1em) / (8em + 1em)));
   N == max(1, floor(33em / 9em));
   N == max(1, floor(3.6));
   N == max(1, 3);
   N == 3;
 
-  W == ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  W == ((available-width + column-gap) / N) - column-gap;
   W == ((32em + 1em) / 3) - 1em;
   W == (33em / 3) - 1em;
   W == (11em) - 1em;
   W == 10em;
 
   H == 2em;
 
   */
@@ -84,9 +84,9 @@
 		Pi nk
 		Pi nk
 		Pi nk
 		Pi nk
 	</div>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-reduce-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-reduce-000.xht
@@ -1,15 +1,15 @@
 <!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 becomes wider to fill available space</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1 '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1 'column-width'" />
   <link rel="match" href="multicol-reduce-000-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that column width is increased to fill the available space: in this test, there are only 2 column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -22,29 +22,29 @@
   color: orange;
   font: 1.25em/1 Ahem;
   margin-bottom: 0.5em;
   width: 30em;
   }
 
   div#test
   {
-  -moz-column-gap: 0;
-  -moz-column-width: 201px;
+  column-gap: 0;
+  column-width: 201px;
 
   /*
 
-  N == max(1, floor((U + -moz-column-gap)/(-moz-column-width + -moz-column-gap)))
+  N == max(1, floor((U + column-gap)/(column-width + column-gap)))
   N == max(1, floor((600px + 0px)/(201px + 0)))
   N == max(1, floor(600px/201px))
   N == max(1, floor(2.985))
   N == max(1, 2)
   N == 2;
 
-  W == max(0, ((U + -moz-column-gap)/N - -moz-column-gap))
+  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;
 
   */
   }
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,19 +19,19 @@
   color: black;
   font: 1.25em/1 Ahem;
   margin-bottom: 0.5em;
   width: 602px;
   }
 
   div#test
   {
-  -moz-columns: 3;
-  -moz-column-gap: 1px;
-  -moz-column-rule: lime solid 1px;
+  columns: 3;
+  column-gap: 1px;
+  column-rule: lime solid 1px;
 
   /*
 
   N == 3;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-001.xht
@@ -1,12 +1,12 @@
 <!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: -moz-column-rule exceeding -moz-column-gap</title>
+  <title>CSS Multi-column Layout Test: column-rule exceeding column-gap</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
   <link rel="match" href="multicol-rule-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="If a column rule is wider than its gap, then the adjacent column boxes overlap the rule. This test checks that if inline content of column boxes uses only 1 twentieth (1/20) of each of the adjacent column box width, then the column rule must shine through 19 twentieths (19/20) of each of the adjacent column boxes (and above their respective backgrounds)." />
 <style type="text/css"><![CDATA[
 @font-face {
@@ -21,19 +21,19 @@
   color: green;
   font: 1.25em/1 Ahem;
   margin-bottom: 0.5em;
   width: 20em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0em;
-  -moz-column-rule: green solid 20em;
+  columns: 2;
+  column-gap: 0em;
+  column-rule: green solid 20em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-002.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</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-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -25,18 +25,18 @@ body>div {
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 15em;
 	position: relative;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
+	column-count: 4;
+	column-gap: 1em;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 3em;
 	height: 2em;
 	width: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-003.xht
@@ -1,12 +1,12 @@
 <!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: -moz-column-rule (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule (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-14 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
   <link rel="match" href="multicol-rule-003-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
@@ -19,21 +19,21 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>
   1s cl
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-004.xht
@@ -1,17 +1,17 @@
 <!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: '-moz-column-fill: balance' and -moz-column-rule</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: balance' and column-rule</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-02 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
   <link rel="match" href="multicol-rule-004-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that when '-moz-column-fill: balance' distributes equally inline content into column boxes in a way that does not completely fill column boxes, then -moz-column-rule must nevertheless still be painted entirely, that is for the whole length of column boxes, even though the whole inline content may not fill the whole length of the column boxes." />
+  <meta name="assert" content="This test checks that when 'column-fill: balance' distributes equally inline content into column boxes in a way that does not completely fill column boxes, then column-rule must nevertheless still be painted entirely, that is for the whole length of column boxes, even though the whole inline content may not fill the whole length of the column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {margin: 8px;}
@@ -36,26 +36,26 @@
   bottom: 100px;
   color: transparent;
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   height: 5em;
   position: relative;
   right: 80px;
   width: 13em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 5em;
-  -moz-column-rule: green solid 5em;
+  column-count: 2;
+  column-fill: balance;
+  column-gap: 5em;
+  column-rule: green solid 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
   <div id="red-overlapped-reference"></div>
 
   <div id="test-overlapping-green">LEFT Colm RIGH Colm</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-001.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule-color (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule-color (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-14 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-color-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -18,28 +18,28 @@
   {
   border: gray solid 1em;
   color: lime;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 14em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  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);
   W == max(0, (14em - (3em)) / 4);
   W == max(0, (11em) / 4);
   W == max(0, 2.75em);
   W == 2.75em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-001.xht
@@ -1,77 +1,77 @@
 <!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: -moz-column-rule-color: inherit</title>
+  <title>CSS Multi-column Layout Test: column-rule-color: inherit</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-02 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz-column-rule-color'" />
+  <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="match" href="multicol-rule-color-inherit-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that, by default, -moz-column-rule-color is the current color applying to the element unless reserved keyword 'inherit' is used in which case -moz-column-rule-color will be inherited from the parent's -moz-column-rule-color value." />
+  <meta name="assert" content="This test checks that, by default, column-rule-color is the current color applying to the element unless reserved keyword 'inherit' is used in which case column-rule-color will be inherited from the parent's column-rule-color value." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#parent
   {
-  -moz-column-rule-color: green;
-  -moz-column-rule-style: none;
+  column-rule-color: green;
+  column-rule-style: none;
   font: 1.25em/1 Ahem;
   width: 17em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (17em - ((3 - 1) * 1em)) / 3);
   W == max(0, (17em - (2 * 1em)) / 3);
   W == max(0, (17em - 2em) / 3);
   W == max(0, 15em / 3);
   W == max(0, 5em);
   W == 5em;
 
   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.
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (5em - ((3 - 1) * 1em)) / 3);
   W == max(0, (5em - (2 * 1em)) / 3);
   W == max(0, (5em - 2em) / 3);
   W == max(0, 3em / 3);
   W == max(0, 1em);
   W == 1em;
 
   */
 
   div
   {
   color: red; /* both div#parent and div.child have and use 'color: red' */
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
-  -moz-column-rule-width: 1em;
+  column-count: 3;
+  column-gap: 1em;
+  column-rule-width: 1em;
   }
 
   div.child
   {
-  -moz-column-rule-color: inherit;
-  -moz-column-rule-style: solid;
+  column-rule-color: inherit;
+  column-rule-style: solid;
   font-size: 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there are 6 vertical green stripes and <strong>no red</strong>.</p>
@@ -135,9 +135,9 @@
 		&nbsp;
 		&nbsp;
 		&nbsp;
 		&nbsp;
 	</div>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-rule-color: inherit (complex)</title>
+  <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="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz-column-rule-color'" />
+  <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="match" href="multicol-rule-color-inherit-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that, by default, -moz-column-rule-color is the current color applying to the element." />
+  <meta name="assert" content="This test checks that, by default, column-rule-color is the current color applying to the element." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#parent
@@ -23,28 +23,28 @@
 
   div.child
   {
   color: red;
   display: inline-block;
   font-size: 1em;
   width: 5em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: inherit;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1em;
+  column-count: 3;
+  column-gap: 1em;
+  column-rule-color: inherit;
+  column-rule-style: solid;
+  column-rule-width: 1em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (5em - ((3 - 1) * 1em)) / 3);
   W == max(0, (5em - (2 * 1em)) / 3);
   W == max(0, (5em - 2em) / 3);
   W == max(0, 3em / 3);
   W == max(0, 1em);
   W == 1em;
 
   */
@@ -118,9 +118,9 @@
 	&nbsp;
 	&nbsp;
 	&nbsp;
 	</div>
 
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dashed-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dashed-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'dashed' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'dashed' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-dashed-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime dashed 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime dashed 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dotted-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dotted-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'dotted' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'dotted' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-dotted-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime dotted 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime dotted 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
@@ -48,9 +48,9 @@
 
   <p>Test passes if the 2 black stripes with green dots in their center are <strong>identical</strong>.</p>
 
   <div id="test">1 <br />2 </div>
 
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-double-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-double-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'double' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'double' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-double-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime double 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime double 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-001.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule-width</title>
+  <title>CSS Multi-column Layout Test: 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-08-14 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-fraction-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,28 +19,28 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 14em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 0.9em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 0.9em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  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);
   W == max(0, (14em - (3em)) / 4);
   W == max(0, (11em) / 4);
   W == max(0, 2.75em);
   W == 2.75em;
 
   */
@@ -52,9 +52,9 @@
   <div>
   1s cl
   2n cl
   3r cl
   4t cl
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-002.xht
@@ -1,18 +1,18 @@
 <!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: wide -moz-column-rule-width painted above background-color</title>
+  <title>CSS Multi-column Layout Test: wide column-rule-width painted above background-color</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 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-fraction-002-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes above the background of the multi-column element but below the inline content inside the multicol element. In this test, the blue -moz-column-rule is painted above the yellow background-color but below (under) the black Ahem glyphs." />
+  <meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes above the background of the multi-column element but below the inline content inside the multicol element. In this test, the blue column-rule is painted above the yellow background-color but below (under) the black Ahem glyphs." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,28 +20,28 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 14em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1.9em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.9em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  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);
   W == max(0, (14em - (3em)) / 4);
   W == max(0, (11em) / 4);
   W == max(0, 2.75em);
   W == 2.75em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-003.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</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-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-fraction-3-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -25,18 +25,18 @@ body>div {
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 14em;
 	position: relative;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
+	column-count: 4;
+	column-gap: 1em;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 2.4em;
 	height: 2em;
 	width: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-3-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-3-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-groove-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-groove-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'groove' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'groove' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-groove-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime groove 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime groove 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-hidden-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-hidden-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'hidden' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'hidden' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-hidden-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: red hidden 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: red hidden 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-inset-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-inset-000.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-rule shorthand with 'inset' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'inset' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-ridge-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="'border-style' values of -moz-column-rule are interpreted as in the collapsing border model in which case 'inset' value is drawn the same as 'ridge'." />
+  <meta name="assert" content="'border-style' values of column-rule are interpreted as in the collapsing border model in which case 'inset' value is drawn the same as 'ridge'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,19 +21,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime inset 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime inset 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-large-001.xht
@@ -1,16 +1,16 @@
 <!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: excessively wide -moz-column-rule-width</title>
+  <title>CSS Multi-column Layout Test: 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. '-moz-column-rule-width'" />
-  <link rel="bookmark" href="http://lists.w3.org/Archives/Public/www-style/2013Sep/0006.html" title="[css3-multicol] z-order of -moz-column-rule: below or above border?" />
+  <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?" />
   <link rel="match" href="multicol-rule-large-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes; its painting will be above background of multi-column element but below the inline content inside the multicol element." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -27,28 +27,28 @@
   background-color: red;
   border: gray solid 1em;
   color: lime;
   font-size: 1em;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 17em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 17em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (15em - ((4 - 1) * 1em)) / 4);
   W == max(0, (15em - (3 * 1em)) / 4);
   W == max(0, (15em - (3em)) / 4);
   W == max(0, (12em) / 4);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-none-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-none-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'none' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'none' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-hidden-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: red none 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: red none 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-outset-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-outset-000.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-rule shorthand with 'outset' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'outset' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-groove-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="'border-style' values of -moz-column-rule are interpreted as in the collapsing border model in which case 'outset' value is drawn the same as 'groove'." />
+  <meta name="assert" content="'border-style' values of column-rule are interpreted as in the collapsing border model in which case 'outset' value is drawn the same as 'groove'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,19 +21,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime outset 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime outset 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-percent-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-percent-001.xht
@@ -1,39 +1,39 @@
 <!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: -moz-column-rule-width and percentage unit (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule-width and percentage unit (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-14 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-containing-002-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that the -moz-column-rule-width property does not accept percentage unit in its values." />
+  <meta name="assert" content="This test checks that the column-rule-width property does not accept percentage unit in its values." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   color: green;
   font: 1.25em/1 Ahem;
   width: 19em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: red;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 0;
-  -moz-column-rule-width: 200%;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: red;
+  column-rule-style: solid;
+  column-rule-width: 0;
+  column-rule-width: 200%;
   }
   ]]></style>
  </head>
 
  <body>
 
   <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&nbsp;&nbsp; 1&nbsp;&nbsp; 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</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-px-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-px-001.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</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-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -24,21 +24,21 @@ body>div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 15em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
-	-moz-column-rule-color: blue;
-	-moz-column-rule-width: 16px;
-	-moz-column-rule-style: solid;
+	column-count: 4;
+	column-gap: 1em;
+	column-rule-color: blue;
+	column-rule-width: 16px;
+	column-rule-style: solid;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 3em;
 	height: 2em;
 	width: 16px;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ridge-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ridge-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'ridge' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'ridge' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-ridge-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime ridge 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime ridge 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-samelength-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-samelength-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-rule-width' has same lenght as '-moz-column-gap'</title>
+  <title>CSS Multi-column Layout Test: 'column-rule-width' has same lenght 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. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-samelength-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -35,43 +35,43 @@
   {
   bottom: 100px;
   color: transparent;
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule-color: green;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 5em;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule-color: green;
+  column-rule-style: solid;
+  column-rule-width: 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
   <div id="red-overlapped-reference"></div>
 
   <div id="test-overlapping-green">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
 
   -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-shorthand-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-shorthand-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-rule' shorthand</title>
+  <title>CSS Multi-column Layout Test: 'column-rule' shorthand</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. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-samelength-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -35,53 +35,53 @@
   {
   bottom: 100px;
   color: transparent;
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule: green solid 5em;
-  -moz-column-rule: normal red 5em;
-  -moz-column-rule: normal 5em red;
-  -moz-column-rule: red normal 5em;
-  -moz-column-rule: red 5em normal;
-  -moz-column-rule: 5em normal red;
-  -moz-column-rule: 5em red normal;
-  -moz-column-rule: red 5em red solid;
-  -moz-column-rule: red 5em solid red;
-  -moz-column-rule: red solid 5em red;
-  -moz-column-rule: red solid red 5em;
-  -moz-column-rule: 5em red solid red;
-  -moz-column-rule: solid red 5em red;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule: green solid 5em;
+  column-rule: normal red 5em;
+  column-rule: normal 5em red;
+  column-rule: red normal 5em;
+  column-rule: red 5em normal;
+  column-rule: 5em normal red;
+  column-rule: 5em red normal;
+  column-rule: red 5em red solid;
+  column-rule: red 5em solid red;
+  column-rule: red solid 5em red;
+  column-rule: red solid red 5em;
+  column-rule: 5em red solid red;
+  column-rule: solid red 5em red;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
   <div id="red-overlapped-reference"></div>
 
   <div id="test-overlapping-green">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
 
   -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-solid-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-solid-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-rule shorthand with 'solid' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'solid' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-solid-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime solid 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime solid 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-001.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-count, stacking</title>
+<title>multicolumn | column-count, stacking</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-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-stacking-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -24,19 +24,19 @@ body>div {
 	color: blue;
 	background: red;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 14em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
-	-moz-column-rule: 28em solid blue;
+	column-count: 4;
+	column-gap: 1em;
+	column-rule: 28em solid blue;
 }
 span {
 	color: black;
 	position: relative;
 	z-index: 1;
 }
 ]]></style>
 </head>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-groove-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-groove-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-rule-style' groove</title>
+  <title>CSS Multi-column Layout Test: 'column-rule-style' groove</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/#crs" title="4.3. '-moz-column-rule-style'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. 'column-rule-style'" />
   <link rel="match" href="multicol-rule-style-groove-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -37,41 +37,41 @@
   div#test
   {
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   top: 0.5em;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule: orange groove 5em;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule: orange groove 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if the 2 orange squares are <strong>identical</strong>.</p>
 
   <div id="reference">T</div>
 
   <div id="test">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
 
   -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-inset-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-inset-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-rule-style' inset</title>
+  <title>CSS Multi-column Layout Test: 'column-rule-style' inset</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/#crs" title="4.3. '-moz-column-rule-style'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. 'column-rule-style'" />
   <link rel="match" href="multicol-rule-style-ridge-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -37,41 +37,41 @@
   div#test
   {
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   top: 0.5em;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule: orange inset 5em;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule: orange inset 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if the 2 orange squares are <strong>identical</strong>.</p>
 
   <div id="reference">T</div>
 
   <div id="test">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
 
   -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-outset-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-outset-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-rule-style' outset</title>
+  <title>CSS Multi-column Layout Test: 'column-rule-style' outset</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/#crs" title="4.3. '-moz-column-rule-style'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. 'column-rule-style'" />
   <link rel="match" href="multicol-rule-style-groove-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -37,41 +37,41 @@
   div#test
   {
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   top: 0.5em;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule: orange outset 5em;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule: orange outset 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if the 2 orange squares are <strong>identical</strong>.</p>
 
   <div id="reference">T</div>
 
   <div id="test">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
 
   -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-ridge-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-ridge-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-rule-style' ridge</title>
+  <title>CSS Multi-column Layout Test: 'column-rule-style' ridge</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/#crs" title="4.3. '-moz-column-rule-style'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. 'column-rule-style'" />
   <link rel="match" href="multicol-rule-style-ridge-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -37,41 +37,41 @@
   div#test
   {
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   top: 0.5em;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule: orange ridge 5em;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule: orange ridge 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if the 2 orange squares are <strong>identical</strong>.</p>
 
   <div id="reference">T</div>
 
   <div id="test">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
 
   -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-shorthand-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-shorthand-001.xht
@@ -24,21 +24,21 @@ body>div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 15em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
-	-moz-column-rule: solid blue 1em;
+	column-count: 4;
+	column-gap: 1em;
+	column-rule: solid blue 1em;
 	column: normal red 1em;
-	-moz-columns: normal red 1em;
+	columns: normal red 1em;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 3em;
 	height: 2em;
 	width: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-000.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-span (basic)</title>
+  <title>CSS Multi-column Layout Test: column-span (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-span-000-ref.xht" />
   <meta name="flags" content="ahem image" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -21,49 +21,49 @@
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 10em;
   }
 
   div#test, div.test2
   {
-  -moz-columns: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  columns: 2;
+  column-fill: balance;
+  column-gap: 0em;
 
   /*
 
   N == 2;
 
   W == 5em;
 
   */
   }
 
   div#test, div#reference {margin-bottom: 0.5em;}
 
   div#column-span
   {
-  -moz-column-span: all;
+  column-span: all;
   font: inherit;
   }
 
   img
   {
   padding-right: 4em;
   vertical-align: top;
   }
   ]]></style>
  </head>
  <body>
 
   <p>Test passes if the 3 rectangles are <strong>identical</strong>.</p>
 
-  <div id="test">A<br />B<div id="-moz-column-span">123456</div>C<br />D</div>
+  <div id="test">A<br />B<div id="column-span">123456</div>C<br />D</div>
 
   <div id="reference"><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /><br /><img src="support/swatch-lime.png" width="120" height="20" alt="Image download support must be enabled" /><br /><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /></div>
 
   <div class="test2">A<br />B</div>
   <div>123456</div>
   <div class="test2">C<br />D</div>
 
  </body>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-span' element (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-span' element (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-16 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <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-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -43,17 +43,17 @@
 
   h4
   {
   background-color: black;
   color: black;
   font: inherit;
   margin: 0;
 
-  -moz-column-span: all;
+  column-span: all;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>
     <span id="top-first-and-second-columns"> bl ue bl ue </span>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-002.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-span' element - large margin-left and 'overflow: hidden'</title>
+  <title>CSS Multi-column Layout Test: 'column-span' element - large margin-left and 'overflow: hidden'</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-16 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <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-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,18 +20,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -44,21 +44,21 @@
 
   h4
   {
   background-color: black;
   color: black;
   font: inherit;
   margin: 1em 0 1em 8em;
 
-  -moz-column-span: all;
+  column-span: all;
   /*
   Since there is not sufficient space for the
   spanning element, UA may treat the element as
-  '-moz-column-span: none'; in which case,
+  'column-span: none'; in which case,
   'overflow: hidden' will take care of
   overflowed content out of multi-column box.
   */
   }
   ]]></style>
  </head>
 
  <body>
@@ -67,9 +67,9 @@
     <span id="top-first-and-second-columns"> bl ue bl ue </span>
     <span id="top-third-and-fourth-columns"> Pi nk Pi nk </span>
     <h4> sPana </h4>
     ab cd ef gh
     ij kl mn oq
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-003.xht
@@ -1,17 +1,17 @@
 <!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: '-moz-column-span: all' (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' (basic)</title>
   <link rel="author" 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/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-count-002-ref.xht"/>
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-span: all' spans across all column boxes and that content in the normal flow (in this test, the '55555 55555 55555 55555') that appears before the element is automatically balanced across all -moz-columns before the element appears." />
+  <meta name="assert" content="This test checks that 'column-span: all' spans across all column boxes and that content in the normal flow (in this test, the '55555 55555 55555 55555') that appears before the element is automatically balanced across all columns before the element appears." />
 
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
@@ -25,30 +25,30 @@
   width: 20em;
   }
 
   div
   {
   background-color: yellow;
   color: black;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-gap: 0;
   }
 
   h4
   {
   background-color: black;
-  -moz-column-span: all;
+  column-span: all;
   color: yellow;
   font: 1em/1 Ahem;
   margin: 0em;
   }
   ]]></style>
  </head>
  <body>
   <div>
   55555 55555 55555 55555
     <h4>&nbsp;4444 4444 4444 4444</h4>
   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>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-003.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-span: all | block-level child</title>
+<title>multicol | column-span: all | block-level child</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
 <link rel="match" href="multicol-span-all-block-sibling-3-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -16,20 +16,20 @@
 <style type="text/css"><![CDATA[
 body>div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1;
 	color: black;
 	background: black;
 
-	-moz-column-count: 2;
+	column-count: 2;
 }
 h1 {
-	-moz-column-span: all;
+	column-span: all;
 }
 ]]></style>
 </head>
 
 <body>
 
 <div>
 	<div>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-3-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-3-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-span: all | block-level child</title>
+<title>multicol | column-span: all | block-level child</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body>div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1;
 	color: black;
 	background: black;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-001.xht
@@ -1,46 +1,46 @@
 <!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: '-moz-column-span: all' element with block children (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' element with block children (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-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="bookmark" title="[css3-multicol] spanning element with only block children" href="http://lists.w3.org/Archives/Public/www-style/2013Aug/0318.html" />
   <link rel="match" href="multicol-span-all-child-001-ref.xht" />
   <meta name="flags" content="ahem may" />
-  <meta name="assert" content="This test checks how a spanning element with block children is rendered inside a multi-column element with a set height which is insufficient for rendering the entire spanning element. Since the available height (10em)is insufficient to render the spanning element (height needed: 3 times 4em) entirely inside the multi-column element, then UA may treat '-moz-column-span: all' as '-moz-column-span: none'." />
+  <meta name="assert" content="This test checks how a spanning element with block children is rendered inside a multi-column element with a set height which is insufficient for rendering the entire spanning element. Since the available height (10em)is insufficient to render the spanning element (height needed: 3 times 4em) entirely inside the multi-column element, then UA may treat 'column-span: all' as 'column-span: none'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body
   {
   color: black;
   font: 1.25em/1 Ahem;
   height: 10em;
   orphans: 1;
   widows: 1;
   width: 10em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: auto;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-fill: auto;
+  column-gap: 0em;
   }
 
   div
   {
   background-color: yellow;
   border: blue solid 2em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   span
   {
   display: block;
   height: 4em;
   width: 5em;
   }
@@ -51,9 +51,9 @@
 
   <div>
     <span>block</span>
     <span>block</span>
     <span>block</span>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-002.xht
@@ -1,49 +1,49 @@
 <!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: '-moz-column-span: all' element with block children (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' element with block children (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-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="bookmark" title="[css3-multicol] spanning element with only block children" href="http://lists.w3.org/Archives/Public/www-style/2013Aug/0318.html" />
   <link rel="match" href="multicol-span-all-child-002-ref.xht" />
   <meta name="flags" content="may" />
-  <meta name="assert" content="This test checks how spanning elements with block children is rendered inside a multi-column element with a set height which is insufficient for rendering both spanning elements entirely. Since available space (height of 8em) is insufficient to render both spanning elements (4 times 4em plus 2em) entirely inside the multi-column element, then UA may treat '-moz-column-span: all' as '-moz-column-span: none'." />
+  <meta name="assert" content="This test checks how spanning elements with block children is rendered inside a multi-column element with a set height which is insufficient for rendering both spanning elements entirely. Since available space (height of 8em) is insufficient to render both spanning elements (4 times 4em plus 2em) entirely inside the multi-column element, then UA may treat 'column-span: all' as 'column-span: none'." />
   <style type="text/css"><![CDATA[
   html {background-color: white;}
 
   body
   {
   background-color: black;
   height: 8em;
   orphans: 1;
   widows: 1;
   width: 10em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-gap: 0em;
 
   /*
 
   N == 2;
 
   W == 5em;
 
   */
 
   }
 
   div, p
   {
   font: 1em/1 serif;
   margin-top: 0em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   span
   {
   color: black;
   display: block;
   height: 4em;
   width: 5em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-001.xht
@@ -1,18 +1,18 @@
 <!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: '-moz-column-span: all' element and width exceeding available multi-colum width (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' element and width exceeding available multi-colum width (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-18 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <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 ('-moz-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[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2;
 
   */
@@ -41,17 +41,17 @@
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 1em 0;
   width: 11em;
 
-  -moz-column-span: all;
+  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
   width is first clipped at column box boundary.
   */
   }
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-002.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-span: all' element</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' 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-08-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <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-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2;
 
   */
@@ -52,17 +52,17 @@
   */
   }
 
   h4#black
   {
   background: black;
   color: black;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   span {color: blue;}
 
   span + span {color: pink;}
   ]]></style>
  </head>
 
@@ -73,9 +73,9 @@
     <span> Pi nk Pi nk </span>
     <h4 id="orange"> orang </h4>
     <h4 id="black"> black </h4>
     na vy na vy
     na vy na vy
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-bottom-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-bottom-001.xht
@@ -1,15 +1,15 @@
 <!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: '-moz-column-span: all' element with vertical margins and width exceeding available multi-colum width (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' element with vertical margins and width exceeding available multi-colum width (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-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <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-bottom-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -42,17 +42,17 @@
   margin: 1em 0;
   }
 
   h4#black
   {
   background: black;
   color: black;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   h4#orange
   {
   background: orange;
   color: orange;
   /*
   In this test, the glyphs "or" are painted into 1st column box.
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-001.xht
@@ -1,15 +1,15 @@
 <!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: vertically adjacent spanning elements with nested margins (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-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <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-nested-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="In this test, the first h4 element would collapse its margin bottom with the top margin of div#child if only div#child was also a spanning element, which is not: the bottom margin of the first h4 element is 8em wide while the top margin of div#child is only 2em wide (1 column box wide). That is why the bottom margin of the first h4 element should not collapse with the top margin of div#child." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -46,17 +46,17 @@
   margin: 0;
   }
 
   h4
   {
   margin: 1em 0;
   width: 11em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
   ]]></style>
  </head>
  <body>
 
   <div id="multi-column">
     na vy na vy
     na vy na vy
@@ -67,9 +67,9 @@
       <h4 id="nested">black</h4>
     </div>
 
     na vy na vy
     na vy na vy
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-002.xht
@@ -1,15 +1,15 @@
 <!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: vertically adjacent spanning elements with nested margins (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-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <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-nested-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="In this test, the first h4 element would collapse its margin bottom with the resulting (from a margin collapsing with its nested h4 element) of top margin of div#child if only div#child was also a spanning element, which is not: the bottom margin of the first h4 element is 8em wide while the top margin of div#child is only 2em wide (1 column box wide). That is why the bottom margin of the first h4 element should not collapse with the top margin of div#child." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -47,17 +47,17 @@
   }
 
   div#child {margin: 1em 0 0;}
 
   h4
   {
   width: 11em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
   ]]></style>
  </head>
  <body>
 
   <div id="multi-column">
     na vy na vy
     na vy na vy
@@ -68,9 +68,9 @@
       <h4 id="nested">black</h4>
     </div>
 
     na vy na vy
     na vy na vy
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-003.xht
@@ -1,13 +1,13 @@
 <!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>multicolomn | -moz-column-span inside block</title>
+<title>multicolomn | column-span inside block</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
 <link rel="match" href="multicol-span-all-margin-nested-3-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -19,20 +19,20 @@ body>div {
 	font-size: 1em;
 	line-height: 1em;
 	color: black;
 	background: black;
 	position: absolute;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
+	column-count: 4;
 }
 #spanned {
-	-moz-column-span: all;
+	column-span: all;
 }
 ]]></style>
 </head>
 
 <body>
 
 <div>
 	<div>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-3-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-3-ref.xht
@@ -1,13 +1,13 @@
 <!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>multicolomn | -moz-column-span inside block</title>
+<title>multicolomn | column-span inside block</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body>div {
 	background: black;
 	width: 22em;
 	height: 2em;
 	position: absolute;
 }
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-span</title>
+<title>multicolumn | column-span</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
 <link rel="match" href="multicol-span-all-margin-nested-firstchild-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -26,34 +26,34 @@ body>div {
 	margin: 1em;
 	border: 1em solid gray;
 	width: 8em;
 	float: left;
 	orphans: 1;
 	widows: 1;
 	overflow: hidden;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 0;
+	column-count: 4;
+	column-gap: 0;
 }
 span, h6 {
 	font-family: ahem;
 	font-size: 1em;
 	font-weight: normal;
 	line-height: 1em;
 	color: black;
 	background: black;
 	padding: 0;
 	margin: 0;
 	display: block;
 }
 h6 {
 	margin: 1em 0;
 	width: 11em;
-	-moz-column-span: all;
+	column-span: all;
 }
 span {
 	color: pink;
 	background: pink;
 	margin: 2em 0;
 }
 h6~h6 {
 	color: black;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-span</title>
+<title>multicolumn | column-span</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-float-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-float-001.xht
@@ -1,18 +1,18 @@
 <!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: floating a column-spanning 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-08-22 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-float-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-span' does not apply to floating element." />
+  <meta name="assert" content="This test checks that 'column-span' does not apply to floating element." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   margin-left: 5em;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 1em;
+  column-count: 2;
+  column-gap: 1em;
 
   /*
 
   N == 2;
 
   W == 5em;
 
   */
@@ -40,17 +40,17 @@
 
   span
   {
   display: block;
   font: inherit;
   margin: 0;
   width: 11em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   span:first-child
   {
   background-color: pink;
   color: pink;
   float: right;
   }
@@ -62,9 +62,9 @@
 
   <div>
 	<span>Pinkk</span>
 	<span>black</span>
 	navyy navyy
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-none-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-none-001.xht
@@ -1,35 +1,35 @@
 <!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: -moz-column-span: none (basic)</title>
+  <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. '-moz-column-span'" />
+  <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 '-moz-column-span: none' element is rendered: it should not span across all column boxes." />
+  <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[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   border: gray solid 1em;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 1em;
+  column-count: 2;
+  column-gap: 1em;
 
   /*
 
   N == 2;
 
   W == 5em;
 
   */
@@ -38,17 +38,17 @@
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 0;
   width: 11em;
 
-  -moz-column-span: none;
+  column-span: none;
   }
 
   #column1-top {color: blue;}
 
   #column1-bottom {color: orange;}
 
   #column2-top {color: pink;}
 
@@ -59,9 +59,9 @@
   <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
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-001.xht
@@ -1,37 +1,37 @@
 <!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: -moz-column-count and table-cell (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and table-cell (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-table-cell-001-ref.xht"/>
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell'." />
+  <meta name="assert" content="This test checks that 'column-count' applies to elements with 'display' set to 'table-cell'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   background-color: red;
   color: black;
   display: table-cell;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 6;
-  -moz-column-gap: 0em;
+  column-count: 6;
+  column-gap: 0em;
   }
   ]]></style>
  </head>
  <body>
 
   <div>P<br />A<br />S<br />S<br />E<br />D</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-001.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-count and height of table-cell (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and height of table-cell (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-table-cell-height-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height." />
+  <meta name="assert" content="This test checks that 'column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   color: black;
   display: table-cell;
   font: 1.25em/1 Ahem;
   height: 18em;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 2em;
+  column-count: 2;
+  column-gap: 2em;
 
   /*
 
   N == 2;
 
   W == 6.5em;
 
   */
@@ -44,9 +44,9 @@
   <div>
   111 222 333 444 555 666 777 888 999
   111 222 333 444 555 666 777 888 999
   111 222 333 444 555 666 777 888 999
   111 222 333 444 555 666 777 888 999
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-002.xht
@@ -1,18 +1,18 @@
 <!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: -moz-column-count and height of table-cell (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and height of table-cell (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-table-cell-height-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height. A set height for a table-cell still remains the minimum height required by the content, even when its layout is influenced by, conditioned by a multi-column layout." />
+  <meta name="assert" content="This test checks that 'column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height. A set height for a table-cell still remains the minimum height required by the content, even when its layout is influenced by, conditioned by a multi-column layout." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   color: black;
   display: table-cell;
   font: 1.25em/1 Ahem;
   height: 0em;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 2em;
+  column-count: 2;
+  column-gap: 2em;
 
   /*
 
   N == 2;
 
   W == 6.5em;
 
   */
@@ -44,9 +44,9 @@
   <div>
   111 222 333 444 555 666 777 888 999
   111 222 333 444 555 666 777 888 999
   111 222 333 444 555 666 777 888 999
   111 222 333 444 555 666 777 888 999
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-vertical-align-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-vertical-align-001.xht
@@ -20,18 +20,18 @@ div {
 	line-height: 1em;
 	vertical-align: middle;
 	color: white;
 	background: #3366CC;
 	width: 6em;
 	height: 400px;
 	display: table-cell;
 
-	-moz-column-count: 2;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-gap: 0;
 }
 ]]></style>
 </head>
 
 <body>
 
 <div>
 aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-001.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-width (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-width-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -22,18 +22,18 @@
 
   div
   {
   background-color: yellow;
   color: black;
   orphans: 1;
   widows: 1;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 6em;
+  column-gap: 0;
+  column-width: 6em;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-002.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-width (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-width-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,24 +19,24 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 6em;
+  column-gap: 0;
+  column-width: 6em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac bl ac
     <span>
     bl ue bl ue
     </span>
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-003.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-width (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-width-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -21,18 +21,18 @@
   color: black;
   font: 1.25em/1 Ahem;
   height: 2em;
   orphans: 1;
   position: relative;
   widows: 1;
   width: 12em;
 
-  -moz-column-width: 6em;
-  -moz-column-gap: 0;
+  column-width: 6em;
+  column-gap: 0;
   }
 
   div > div
   {
   background-color: black;
   height: 2em;
   position: absolute;
   top: 0;
@@ -59,9 +59,9 @@
   <div id="multi-column">
     <div></div>
     <div id="s2"></div>
     <div id="s3"></div>
     <div id="s4"></div>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-001.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-count and -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and column-width (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <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-width-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -22,19 +22,19 @@
 
   div
   {
   background-color: yellow;
   color: black;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 5;
-  -moz-column-gap: 0;
-  -moz-column-width: 6em;
+  column-count: 5;
+  column-gap: 0;
+  column-width: 6em;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-002.xht
@@ -1,15 +1,15 @@
 <!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: -moz-column-count and -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and column-width (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-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -24,19 +24,19 @@
   width: 20em;
   }
 
   div
   {
   background-color: yellow;
   color: black;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
-  -moz-column-width: 5em;
+  column-count: 4;
+  column-gap: 0;
+  column-width: 5em;
   }
   ]]></style>
  </head>
  <body>
   <div>55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1 333 55555 55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1 22&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-001.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-width</title>
+<title>multicolumn | column-width</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
 <link rel="match" href="multicol-width-ems-ref.xht"/>
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 	width: 40em;
@@ -16,18 +16,18 @@ div {
 	font-family: monospace;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;
 	background: yellow;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-width: 8em;
-	-moz-column-gap: 0;
+	column-width: 8em;
+	column-gap: 0;
 }
 ]]></style>
 </head>
 
 <body>
 <div>
 	one two three four
 	five six seven eight
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-ref.xht
@@ -1,13 +1,13 @@
 <!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 | -moz-column-width</title>
+<title>multicolumn | column-width</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 	width: 40em;
 }
 div {
 	font-family: monospace;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-invalid-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-invalid-001.xht
@@ -1,18 +1,18 @@
 <!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: invalid -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: invalid column-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-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that '-moz-column-width: bzzt' is invalid (generating a parsing error) and therefore will be ignored." />
+  <meta name="assert" content="This test checks that 'column-width: bzzt' is invalid (generating a parsing error) and therefore will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: bzzt;
+  column-gap: 0;
+  column-width: bzzt;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
@@ -39,9 +39,9 @@
     bl ue
     </span>
     <span>
     bl ue
     </span>
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-large-001.xht
@@ -1,18 +1,18 @@
 <!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: large -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: large column-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-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' may be wider (to fill the available space). In this test, the actual -moz-column-width will be increased to 12em." />
+  <meta name="assert" content="This test checks that a set 'column-width' may be wider (to fill the available space). In this test, the actual column-width will be increased to 12em." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 9em;
+  column-gap: 0;
+  column-width: 9em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
@@ -39,9 +39,9 @@
     bl ue
     </span>
     <span>
     bl ue
     </span>
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-large-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-large-002.xht
@@ -1,18 +1,18 @@
 <!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: large -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: large column-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-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' equal in width to the whole available space of the multi-column will use it all for its column box." />
+  <meta name="assert" content="This test checks that a set 'column-width' equal in width to the whole available space of the multi-column will use it all for its column box." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 12em;
+  column-gap: 0;
+  column-width: 12em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
@@ -39,9 +39,9 @@
     bl ue
     </span>
     <span>
     bl ue
     </span>
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-negative-001.xht
@@ -1,18 +1,18 @@
 <!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: negative -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: negative column-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-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' can not be negative." />
+  <meta name="assert" content="This test checks that a set 'column-width' can not be negative." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,17 +20,17 @@
   background-color: black;
   border: black solid 1em;
   color: yellow;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 19em;
 
-  -moz-column-width: -100px;
-  -moz-column-gap: 0;
+  column-width: -100px;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>4444 4444 4444 4444 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp; 4444 4444 4444 4444 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 4444 4444</div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-small-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-small-001.xht
@@ -1,19 +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 Multi-column Layout Test: narrow -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: narrow column-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-08-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="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-small-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' which is small with regards to width of multi-column element. In this test, in-flow content that extends into column gaps is clipped in the middle of the column gap. " />
+  <meta name="assert" content="This test checks that a set 'column-width' which is small with regards to width of multi-column element. In this test, in-flow content that extends into column gaps is clipped in the middle of the column gap. " />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 1em;
+  column-gap: 0;
+  column-width: 1em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   Bl ac
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-zero-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-zero-height-001.xht
@@ -1,27 +1,27 @@
 <!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 zero height</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-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-zero-height-001-ref.xht" />
   <meta name="flags" content="" />
   <style type="text/css"><![CDATA[
   div#multi-column
   {
   height: 0;
   orphans: 1;
   widows: 1;
   width: 200px;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 0;
+  column-count: 2;
+  column-gap: 0;
 
   /*
 
   N == 2;
 
   W == 100px;
 
   */
@@ -36,9 +36,9 @@
   }
   ]]></style>
  </head>
  <body>
   <div id="multi-column">
     <div></div>
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html
+++ b/layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html
@@ -7,18 +7,18 @@
   <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
 
         html,body {
             color:black; background-color:white; font-size:16px; padding:0; margin:0;
         }
 	
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; }
   .short { height: 5px; }
   .short p { }
 
     </style>
--- a/layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html
@@ -9,18 +9,18 @@
   <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
 
         html,body {
             color:black; background-color:white; font-size:16px; padding:0; margin:0;
         }
 	
   .colset {
-    -moz-column-count: 3;
-    -moz-column-gap: 0;
+    column-count: 3;
+    column-gap: 0;
     border: solid silver;
     width: 9em;
   }
   p { margin: 0; page-break-inside:avoid; }
   .short { height: 5px; page-break-inside:avoid; }
   .short p { page-break-inside:auto; }
 
     </style>
--- a/layout/reftests/w3c-css/submitted/multicol3/multicol-height-002.xht
+++ b/layout/reftests/w3c-css/submitted/multicol3/multicol-height-002.xht
@@ -8,19 +8,19 @@
   <meta name="flags" content="" />
   <meta name="assert" content="Percentage heights with a multi-column element are relative to the computed height of the multicolumn box, and this works even when the multi-column element is paginated." />
   <link rel="match" href="reference/multicol-height-002.xht" />
   <style type="text/css"><![CDATA[
     html, body { height: 100%; }
     * { margin: 0; }
     div {
       border: double blue 12px;
-      -moz-column-count:2;
-      -moz-column-gap:0;
-      -moz-column-fill: balance;
+      column-count:2;
+      column-gap:0;
+      column-fill: balance;
       height: 150%;
     }
     div > p {
       border-right: solid orange 12px;
       width: 0;
       margin: 0 auto;
       height: 200%;
     }
--- a/layout/reftests/writing-mode/1079154-1-vertical-rl-columns.html
+++ b/layout/reftests/writing-mode/1079154-1-vertical-rl-columns.html
@@ -14,26 +14,26 @@ div { margin: 10px; background: #eee; }
 </head>
 
 <body>
 
 <div>
 First single-column division.
 </div>
 
-<div style="-moz-column-count:2; -moz-column-gap:10px">
+<div style="column-count:2; column-gap:10px">
 Two columns<br>
 one<br>two<br>three<br>four<br>five<br>six
 </div>
 
 <div>
 Another single-column division.
 </div>
 
-<div style="-moz-column-count:3; -moz-column-gap:5px">
+<div style="column-count:3; column-gap:5px">
 Three columns<br>
 one<br>two<br>three<br>four<br>five<br>six
 </div>
 
 <div>
 Final single-column division.
 </div>
 
--- a/layout/style/crashtests/368175-1.html
+++ b/layout/style/crashtests/368175-1.html
@@ -1,14 +1,14 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width: 300px; height: 200px; overflow: auto">
- <div style='direction: rtl; -moz-column-width:1em; -moz-column-gap:1em; width: 500px;'>
+ <div style='direction: rtl; column-width:1em; column-gap:1em; width: 500px;'>
   <p>滾滾長江東逝水,浪花淘盡英雄。是非成敗轉頭空:青山依舊在,幾度夕陽紅。</p>
-  <p style='direction: rtl; -moz-column-width:1em; -moz-column-gap:1em;'>
+  <p style='direction: rtl; column-width:1em; column-gap:1em;'>
   滾滾長江東逝水,浪花淘盡英雄。是非成敗轉頭空:青山依舊在,幾度夕陽紅。</p>
  </div>
 </div>
 </body>
 </html>
--- a/layout/style/crashtests/447783-1.html
+++ b/layout/style/crashtests/447783-1.html
@@ -1,8 +1,8 @@
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Hang with -moz-column-count and word-wrap</title>
+<title>Hang with column-count and word-wrap</title>
 </head><body>
-<div style="border: 1px solid black; word-wrap: normal; -moz-column-count: 2; width: 110px;">
+<div style="border: 1px solid black; word-wrap: normal; column-count: 2; width: 110px;">
 a<span style="word-wrap: break-word;">abcde</span>
 </div>
 </body></html>
--- a/layout/style/crashtests/588627-1.html
+++ b/layout/style/crashtests/588627-1.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <html>
-<body style="-moz-column-rule: 137438953471mozmm groove transparent"></body>
-</html>
\ No newline at end of file
+<body style="column-rule: 137438953471mozmm groove transparent"></body>
+</html>
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -16,21 +16,21 @@
   text-overflow: inherit;
   overflow: inherit;
   overflow-clip-box: inherit;
   padding: inherit;
   block-size: 100%; /* Need this so percentage block-sizes of kids work right */
   /* Please keep the Multicol/Flex/Grid/Align sections below in sync with
      ::-moz-scrolled-content in ua.css and ::-moz-button-content below. */
   /* Multicol container */
-  -moz-column-count: inherit;
-  -moz-column-width: inherit;
-  -moz-column-gap: inherit;
-  -moz-column-rule: inherit;
-  -moz-column-fill: inherit;
+  column-count: inherit;
+  column-width: inherit;
+  column-gap: inherit;
+  column-rule: inherit;
+  column-fill: inherit;
   /* Flex container */
   flex-direction: inherit;
   flex-wrap: inherit;
   /* Grid container */
   grid-auto-columns: inherit;
   grid-auto-rows: inherit;
   grid-auto-flow: inherit;
   grid-column-gap: inherit;
@@ -659,21 +659,21 @@ button {
   display: inline-block;
 }
 
 *|*::-moz-button-content {
   display: block;
   /* Please keep the Multicol/Flex/Grid/Align sections below in sync with
      ::-moz-scrolled-content in ua.css and ::-moz-fieldset-content above. */
   /* Multicol container */
-  -moz-column-count: inherit;
-  -moz-column-width: inherit;
-  -moz-column-gap: inherit;
-  -moz-column-rule: inherit;
-  -moz-column-fill: inherit;
+  column-count: inherit;
+  column-width: inherit;
+  column-gap: inherit;
+  column-rule: inherit;
+  column-fill: inherit;
   /* Flex container */
   flex-direction: inherit;
   flex-wrap: inherit;
   /* Grid container */
   grid-auto-columns: inherit;
   grid-auto-rows: inherit;
   grid-auto-flow: inherit;
   grid-column-gap: inherit;
--- a/layout/style/res/ua.css
+++ b/layout/style/res/ua.css
@@ -168,21 +168,21 @@
   -moz-box-orient: inherit;
   /* make unicode-bidi inherit, otherwise it has no effect on text inputs and
      blocks with overflow: scroll; */
   unicode-bidi: inherit;
   text-overflow: inherit;
   /* Please keep the Multicol/Flex/Grid/Align sections below in sync with
      ::-moz-fieldset-content/::-moz-button-content in forms.css */
   /* Multicol container */
-  -moz-column-count: inherit;
-  -moz-column-width: inherit;
-  -moz-column-gap: inherit;
-  -moz-column-rule: inherit;
-  -moz-column-fill: inherit;
+  column-count: inherit;
+  column-width: inherit;
+  column-gap: inherit;
+  column-rule: inherit;
+  column-fill: inherit;
   /* Flex container */
   flex-direction: inherit;
   flex-wrap: inherit;
   /* Grid container */
   grid-auto-columns: inherit;
   grid-auto-rows: inherit;
   grid-auto-flow: inherit;
   grid-column-gap: inherit;
@@ -209,17 +209,17 @@
 
 *|*::-moz-viewport-scroll {
   overflow: auto;
 %ifdef XP_WIN
   resize: both;
 %endif
 }
 
-*|*::-moz-column-content {
+*|*::column-content {
   /* the column boxes inside a column-flowed block */
   /* make unicode-bidi inherit, otherwise it has no effect on column boxes */
   unicode-bidi: inherit;
   text-overflow: inherit;
   /* inherit the outer frame's display, otherwise we turn into an inline */
   display: inherit !important;
   /* Carry through our parent's height so that %-height children get
   their heights set */
--- a/layout/style/test/test_dont_use_document_colors.html
+++ b/layout/style/test/test_dont_use_document_colors.html
@@ -3,17 +3,17 @@
 <!--
 -->
 <head>
   <title>Test for preference not to use document colors</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <style type="text/css">
 
-  #one, #three { background: blue; color: yellow; border: thin solid red; -moz-column-rule: 2px solid green; text-shadow: 2px 2px green; box-shadow: 3px 7px blue; }
+  #one, #three { background: blue; color: yellow; border: thin solid red; column-rule: 2px solid green; text-shadow: 2px 2px green; box-shadow: 3px 7px blue; }
   #two { background: transparent; border: thin solid; }
   #five, #six {border: thick solid red; border-inline-start-color:green; border-inline-end-color:blue}
   #seven {
     border: 3px solid;
     -moz-border-top-colors: blue aqua fuchsia;
     -moz-border-right-colors: aqua blue fuchsia;
     -moz-border-bottom-colors: blue fuchsia aqua;
     -moz-border-left-colors: fuchsia blue blue;
@@ -64,30 +64,30 @@ function part1()
     isnot(cs1.borderTopColor, cs2.borderTopColor, "border-top-color applies");
     isnot(cs1.borderRightColor, cs2.borderRightColor,
           "border-right-color applies");
     isnot(cs1.borderLeftColor, cs2.borderLeftColor,
           "border-left-color applies");
     isnot(cs1.borderBottomColor, cs2.borderBottomColor,
           "border-top-color applies");
     isnot(cs1.MozColumnRuleColor, cs2.MozColumnRuleColor,
-          "-moz-column-rule-color applies");
+          "column-rule-color applies");
     isnot(cs1.textShadow, cs2.textShadow,
           "text-shadow applies");
     isnot(cs1.boxShadow, cs2.boxShadow,
           "box-shadow applies");
     is(cs1.borderTopColor, cs3.borderTopColor, "border-top-color applies");
     is(cs1.borderRightColor, cs3.borderRightColor,
        "border-right-color applies");
     is(cs1.borderLeftColor, cs3.borderLeftColor,
        "border-left-color applies");
     is(cs1.borderBottomColor, cs3.borderBottomColor, 
        "border-top-color applies");
     is(cs1.MozColumnRuleColor, cs3.MozColumnRuleColor,
-       "-moz-column-rule-color applies");
+       "column-rule-color applies");
     is(cs1.textShadow, cs3.textShadow,
        "text-shadow applies");
     is(cs1.boxShadow, cs3.boxShadow,
        "box-shadow applies");
     isnot(cs5.borderRightColor, cs2.borderRightColor,
           "border-inline-end-color applies");
     isnot(cs5.borderLeftColor, cs2.borderLeftColor,
           "border-inline-start-color applies");    
@@ -148,17 +148,17 @@ function part2()
        "-moz-border-right-colors is blocked");
     is(cs7.MozBorderBottomColors, cs2.MozBorderBottomColors,
        "-moz-border-bottom-colors is blocked");
     is(cs7.MozBorderLeftColors, cs2.MozBorderLeftColors,
        "-moz-border-left-colors is blocked");
     is(cs1.borderBottomColor, cs2.borderBottomColor,
        "border-bottom-color is blocked");
     is(cs1.MozColumnRuleColor, cs2.MozColumnRuleColor,
-       "-moz-column-rule-color is blocked");
+       "column-rule-color is blocked");
     is(cs1.textShadow, cs2.textShadow,
        "text-shadow is blocked");
     is(cs1.boxShadow, cs2.boxShadow,
        "box-shadow is blocked");
     is(cs3.backgroundColor, cs1.backgroundColor, "background-color transparency preserved (opaque)");
     is(cs3.color, cs4.color, "color is blocked");
     is(cs3.borderTopColor, cs4.borderTopColor, "border-top-color is blocked");
     is(cs3.borderRightColor, cs4.borderRightColor,
--- a/layout/style/test/test_transitions_events.html
+++ b/layout/style/test/test_transitions_events.html
@@ -14,17 +14,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 #one { transition-duration: 500ms; transition-property: all; }
 #two { transition: margin-left 1s; }
 #three { transition: margin 0.5s 0.25s; }
 
 #four, #five, #six, #seven::before, #seven::after {
   transition: 500ms color;
   border-color: black; /* don't derive from color */
-  -moz-column-rule-color: black; /* don't derive from color */
+  column-rule-color: black; /* don't derive from color */
   text-decoration-color: black; /* don't derive from color */
   outline-color: black; /* don't derive from color */
 }
 
 #four {
   /* give the reversing transition a long duration; the reversing will
      still be quick */
   transition-duration: 30s;
--- a/layout/svg/crashtests/409565-1.xhtml
+++ b/layout/svg/crashtests/409565-1.xhtml
@@ -1,3 +1,3 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="white-space: pre;"><body style="width: 24px; height: 24px; -moz-column-width: 200px;">
+<html xmlns="http://www.w3.org/1999/xhtml" style="white-space: pre;"><body style="width: 24px; height: 24px; column-width: 200px;">
 
   <svg xmlns="http://www.w3.org/2000/svg" style="float: left;"></svg></body></html>
--- a/layout/svg/crashtests/767535-1.xhtml
+++ b/layout/svg/crashtests/767535-1.xhtml
@@ -1,9 +1,9 @@
-<html xmlns="http://www.w3.org/1999/xhtml" style="-moz-columns: 2 auto;" class="reftest-wait">
+<html xmlns="http://www.w3.org/1999/xhtml" style="columns: 2 auto;" class="reftest-wait">
   <head>
     <script>
 
 function test() { 
   var r = document.documentElement; 
   document.removeChild(r); 
   document.appendChild(r); 
   document.documentElement.removeAttribute("class");
--- a/layout/tables/crashtests/331446-1.xhtml
+++ b/layout/tables/crashtests/331446-1.xhtml
@@ -19,17 +19,17 @@ function f2()
   document.getElementById("styles").textContent = ".thisMatchesNothing { }";
   document.documentElement.removeAttribute("class");
 }
 
 </script>
 
 </head>
 
-<body style="position: relative; -moz-column-width: 1px;">
+<body style="position: relative; column-width: 1px;">
 
 <table id="table">
  <tr>
   <td>Table</td>
  </tr>
 </table>
 
 <div>A</div>
--- a/layout/tables/crashtests/362275.html
+++ b/layout/tables/crashtests/362275.html
@@ -1,14 +1,14 @@
 <html class="reftest-print"><head>
-<title>Testcase bug 362275 - Hang with testcase on print preview, using -moz-column-count and table related stuff</title>
+<title>Testcase bug 362275 - Hang with testcase on print preview, using column-count and table related stuff</title>
 </head>
 <body>
 This page should not hang Mozilla on print preview
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
   <span style="display: table-cell;">	
     <span>
       <textarea style="display: table-cell;"></textarea>
     </span>
   </span>
   <span style="display: table-header-group;"></span>
 </div>
 </body></html>
--- a/layout/tables/crashtests/367749.html
+++ b/layout/tables/crashtests/367749.html
@@ -1,14 +1,14 @@
 <html><head>
-<title>Testcase bug 362275 - Hang with testcase on print preview, using -moz-column-count and table related stuff</title>
+<title>Testcase bug 362275 - Hang with testcase on print preview, using column-count and table related stuff</title>
 </head>
 <body>
 This page should not hang Mozilla on print preview
-<div style="-moz-column-count: 2;">
+<div style="column-count: 2;">
   <span style="display: table-cell;">	
     <span>
       <textarea style="display: table-cell;"></textarea>
     </span>
   </span>
   <span style="display: table-header-group;"></span>
 </div>
 </body></html>
--- a/layout/tables/crashtests/391898-1.html
+++ b/layout/tables/crashtests/391898-1.html
@@ -1,19 +1,19 @@
 <html>
 <head>
 </head>
 
-<body style="-moz-column-width: 10em;">
+<body style="column-width: 10em;">
 
 <table>
   <tbody>
     <tr>
       <td><img src="about:blank"></td>
     </tr>
     <tr>
     </tr>
   </tbody>
 </table>
 
 </body>
 </html>
- 
\ No newline at end of file
+ 
--- a/layout/tables/crashtests/408753-1.xhtml
+++ b/layout/tables/crashtests/408753-1.xhtml
@@ -1,1 +1,1 @@
-<html xmlns="http://www.w3.org/1999/xhtml"><body style="-moz-column-width: 1px; position: absolute;"><table style="position: absolute;"><tbody style="bottom: -10px;">foo</tbody></table></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><body style="column-width: 1px; position: absolute;"><table style="position: absolute;"><tbody style="bottom: -10px;">foo</tbody></table></body></html>
--- a/layout/tables/crashtests/410428-1.xhtml
+++ b/layout/tables/crashtests/410428-1.xhtml
@@ -1,9 +1,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 </head>
 <body>
 
-<div style="-moz-column-count: 3;"><table style="margin: 17895704px;"></table>x</div>
+<div style="column-count: 3;"><table style="margin: 17895704px;"></table>x</div>
 
 </body>
 </html>
--- a/layout/tables/crashtests/576890-1.html
+++ b/layout/tables/crashtests/576890-1.html
@@ -1,8 +1,8 @@
 <html class="reftest-print">
 <head>
 </head>
-<body style=" -moz-column-count: 2;">
+<body style=" column-count: 2;">
 <b style="display: table-footer-group; page-break-before: always;"></b>
 <span style="display: table-header-group;"></span>
 </body>
 </html>
--- a/layout/tables/crashtests/576890-2.html
+++ b/layout/tables/crashtests/576890-2.html
@@ -1,8 +1,8 @@
 <html class="reftest-print">
 <head>
 </head>
-<body style=" -moz-column-count: 2;">
+<body style=" column-count: 2;">
 <b style="display: table-footer-group; page-break-before: always;">footer</b>
 <span style="display: table-header-group;">header</span>
 </body>
 </html>
--- a/layout/tables/crashtests/576890-3.html
+++ b/layout/tables/crashtests/576890-3.html
@@ -1,8 +1,8 @@
 <html class="reftest-print">
 <head>
 </head>
-<body style=" -moz-column-count: 2;">
+<body style=" column-count: 2;">
 <b style="display: table-footer-group;"></b>
 <span style="display: table-header-group; page-break-after: always;"></span>
 </body>
 </html>
--- a/layout/tables/crashtests/678447-1.html
+++ b/layout/tables/crashtests/678447-1.html
@@ -1,10 +1,10 @@
 <html class="reftest-print">
 <head>
 </head>
-<body style=" -moz-column-count: 2;">
+<body style=" column-count: 2;">
 <table>
 <tbody><tr><td>rowgroup1</td></tr></tbody>
 <tbody><tr><td>rowgroup2</td></tr></tbody>
 </table>
 </body>
 </html>
--- a/layout/xul/crashtests/470272.html
+++ b/layout/xul/crashtests/470272.html
@@ -3,17 +3,17 @@
 <script>
 function doe2(i) {
 document.documentElement.offsetHeight;
 document.getElementById('a').setAttribute('style', 'display: -moz-inline-box;');
 document.documentElement.offsetHeight;
 }
 </script>
 </head>
-<body style="float: right; -moz-column-count: 2; height: 20%;" onload="setTimeout(doe2,0);">
+<body style="float: right; column-count: 2; height: 20%;" onload="setTimeout(doe2,0);">
   <div style="display: none;"></div>
   <ul style="display: -moz-inline-box;"></ul>
   <span id="a">
     <ul style="display: -moz-grid; overflow: scroll;"></ul>
       <span style="display: -moz-inline-box; height: 10px;">
         <span style="position: absolute;"></span>
       </span>
   </span>
--- a/netwerk/test/crashtests/785753-1.html
+++ b/netwerk/test/crashtests/785753-1.html
@@ -40,17 +40,17 @@ setTimeout(function(){
 try{test1.style['line-height']='43px';}catch(e){}
 try{styleSheet0.insertRule(".undefined,.undefined{clear:right; }",styleSheet0.cssRules.length);}catch(e){}
 try{test2.style.setProperty('bottom','inherit','important');}catch(e){}
 try{test3.parentNode.removeChild(test3)}catch(e){};
 try{test0.style.setProperty('overflow-x','no-content','important');}catch(e){}
 },0);
 
 setTimeout(function(){
-try{styleSheet0.insertRule(".undefined,.undefined{font-size:40px; overflow-x:no-content; -moz-transition-duration:-5.408991568721831s; -moz-column-span:483; }",styleSheet0.cssRules.length);}catch(e){}
+try{styleSheet0.insertRule(".undefined,.undefined{font-size:40px; overflow-x:no-content; -moz-transition-duration:-5.408991568721831s; column-span:483; }",styleSheet0.cssRules.length);}catch(e){}
 try{test0.parentNode.removeChild(test0)}catch(e){};
 try{test0.insertBefore(test2);}catch(e){}
 try{test3.style.setProperty('bottom','inherit','important');}catch(e){}
 try{test2.style.setProperty('background-origin','border-box','important');}catch(e){}
 },2);
 
 setTimeout(function(){
 window.resizeTo(1018,353)
@@ -99,17 +99,17 @@ try{test2.replaceChild(test3,test2.lastC
 try{test1.style['border-left-color']='#6D8997';}catch(e){}
 try{test1.innerHtml=test3.innerHtml;}catch(e){}
 },6);
 
 setTimeout(function(){
 try{test2.insertBefore(test1);}catch(e){}
 try{test2.innerHtml=test3.innerHtml;}catch(e){}
 try{test0.appendChild(test2);}catch(e){}
-try{styleSheet0.insertRule(".undefined,.undefined{resize:both; background-color:#A22225; position:relative; -moz-column-width:auto; letter-spacing:361px; border-top-width:151%; }",styleSheet0.cssRules.length);}catch(e){}
+try{styleSheet0.insertRule(".undefined,.undefined{resize:both; background-color:#A22225; position:relative; column-width:auto; letter-spacing:361px; border-top-width:151%; }",styleSheet0.cssRules.length);}catch(e){}
 document.body.style.zoom=1.8764980849809945
 },6);
 
 setTimeout(function(){
 try{styleSheet1.insertRule(".undefined,.undefined,.undefined{outline-color:rgba(126,179,46,0.8964905887842178); width:183; }",styleSheet1.cssRules.length);}catch(e){}
 try{test2.insertBefore(test3);}catch(e){}
 try{test1.innerHtml=test3.innerHtml;}catch(e){}
 try{styleSheet0.insertRule("article,footer,article,article{border-bottom-right-radius:7px; }",0);}catch(e){}
--- a/testing/marionette/harness/marionette/www/test_carets_columns.html
+++ b/testing/marionette/harness/marionette/www/test_carets_columns.html
@@ -2,19 +2,19 @@
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
   <head>
     <meta charset="UTF-8">
     <style>
     #columns {
-      -moz-column-count: 2;
+      column-count: 2;
       -webkit-column-count: 2;
-      -moz-column-rule: 1px solid lightgray;
+      column-rule: 1px solid lightgray;
       -webkit-column-rule: 1px solid lightgray;
       border: 1px solid lightblue;
       width: 450px;
     }
     </style>
   </head>
   <body>
     <div id="columns">
--- a/testing/web-platform/tests/2dcontext/tools/current-work-canvas.xhtml
+++ b/testing/web-platform/tests/2dcontext/tools/current-work-canvas.xhtml
@@ -76,35 +76,35 @@
    .details-example img { vertical-align: top; }
 
    #base64-table {
      white-space: nowrap;
      font-size: 0.6em;
      column-width: 6em;
      column-count: 5;
      column-gap: 1em;
-     -moz-column-width: 6em;
-     -moz-column-count: 5;
-     -moz-column-gap: 1em;
+     column-width: 6em;
+     column-count: 5;
+     column-gap: 1em;
      -webkit-column-width: 6em;
      -webkit-column-count: 5;
      -webkit-column-gap: 1em;
    }
    #base64-table thead { display: none; }
    #base64-table * { border: none; }
    #base64-table tbody td:first-child:after { content: ':'; }
    #base64-table tbody td:last-child { text-align: right; }
 
    #named-character-references-table {
      white-space: nowrap;
      font-size: 0.6em;
      column-width: 30em;
      column-gap: 1em;
-     -moz-column-width: 30em;
-     -moz-column-gap: 1em;
+     column-width: 30em;
+     column-gap: 1em;
      -webkit-column-width: 30em;
      -webkit-column-gap: 1em;
    }
    #named-character-references-table &gt; table &gt; tbody &gt; tr &gt; td:first-child + td,
    #named-character-references-table &gt; table &gt; tbody &gt; tr &gt; td:last-child { text-align: center; }
    #named-character-references-table &gt; table &gt; tbody &gt; tr &gt; td:last-child:hover &gt; span { position: absolute; top: auto; left: auto; margin-left: 0.5em; line-height: 1.2; font-size: 5em; border: outset; padding: 0.25em 0.5em; background: white; width: 1.25em; height: auto; text-align: center; }
    #named-character-references-table &gt; table &gt; tbody &gt; tr#entity-CounterClockwiseContourIntegral &gt; td:first-child { font-size: 0.5em; }