diff --git 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 index e9b326b22550..c39deb12f00b 100644 --- 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 @@ -10,10 +10,10 @@ 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; } diff --git 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 index 79405c9a2ae4..f18a9ceefa19 100644 --- 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 @@ -12,10 +12,10 @@ 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; } diff --git a/layout/reftests/w3c-css/submitted/multicol3/multicol-height-002.xht b/layout/reftests/w3c-css/submitted/multicol3/multicol-height-002.xht index 460c2d43a123..aaf544cb16bb 100644 --- a/layout/reftests/w3c-css/submitted/multicol3/multicol-height-002.xht +++ b/layout/reftests/w3c-css/submitted/multicol3/multicol-height-002.xht @@ -13,9 +13,9 @@ * { 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 { diff --git a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh index 400d83db63c1..813646b5fe73 100755 --- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh +++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh @@ -23,6 +23,6 @@ fi rsync -avz --delete --filter=". ./sync-tests-filter" "$MOZTREE"/layout/reftests/w3c-css/submitted/ ./ sed -i -e 's/^\(\(fails\|needs-focus\|random\|skip\|asserts\|slow\|require-or\|silentfail\|pref\|test-pref\|ref-pref\|fuzzy\)[^ ]* *\?\)\+//;/^default-preferences /d;s/ \?# \?\(TC: \)\?[bB]ug.*//;s/ # Initial mulet triage:.*//' $(find . -name reftest.list) -sed -i -e 's/-moz-column/column/g;s/-moz-crisp-edges/pixelated/g' $(find . -regex ".*\.\(xht\|xhtml\|html\|css\)") +sed -i -e 's/-moz-crisp-edges/pixelated/g' $(find . -regex ".*\.\(xht\|xhtml\|html\|css\)") git add -A . git commit -m"Sync Mozilla tests as of https://hg.mozilla.org/mozilla-central/rev/$MOZREV ." .