Bug 975744 - unprefix font-feature-settings and font-language-override in tests. r=jfkthame
authorJohn Daggett <jdaggett@mozilla.com>
Wed, 20 Aug 2014 16:54:37 +0900
changeset 200515 3731eca5c25b609c61642289f854a92f145e74fa
parent 200514 0bab389db590003b3d311e722d8335ac60ba64a6
child 200516 39b35917363734c0b70413d4daaf8fc7c1734a1f
push id47921
push userjdaggett@mozilla.com
push dateWed, 20 Aug 2014 08:13:32 +0000
treeherdermozilla-inbound@39b359173637 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs975744
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 975744 - unprefix font-feature-settings and font-language-override in tests. r=jfkthame
layout/generic/MathMLTextRunFactory.cpp
layout/reftests/counter-style/ref-common.css
layout/reftests/counter-style/test-common.css
layout/reftests/counters/counter-suffix-ref.html
layout/reftests/font-features/alternates-order-ref.html
layout/reftests/font-features/alternates-order.html
layout/reftests/font-features/annotations-ref.html
layout/reftests/font-features/font-features-across-space-1-ref.html
layout/reftests/font-features/font-features-across-space-1.html
layout/reftests/font-features/font-features-hlig-2.html
layout/reftests/font-features/font-features-hlig-3.html
layout/reftests/font-features/font-features-hlig-4.html
layout/reftests/font-features/font-features-hlig-5.html
layout/reftests/font-features/font-features-hlig.html
layout/reftests/font-features/font-features-noliga.html
layout/reftests/font-features/font-features-oldsyntax-1.html
layout/reftests/font-features/font-features-oldsyntax-2.html
layout/reftests/font-features/font-features-oldsyntax-3.html
layout/reftests/font-features/font-features-oldsyntax-4.html
layout/reftests/font-features/font-features-order-1.html
layout/reftests/font-features/font-features-order-2.html
layout/reftests/font-features/font-features-order-3.html
layout/reftests/font-features/font-features-turkish-override-1.html
layout/reftests/font-features/font-features-turkish-override-2.html
layout/reftests/font-features/font-features-turkish-override-3.html
layout/reftests/font-features/font-features-turkish-override-4.html
layout/reftests/font-features/font-features-turkish-override-5.html
layout/reftests/font-features/fwid-spaces.html
layout/reftests/font-features/kerning-sanity-check-kern.html
layout/reftests/font-features/kerning-sanity-check-nokern.html
layout/reftests/font-features/kerning-spaces-arial-kern.html
layout/reftests/font-features/kerning-spaces-arial-nokern.html
layout/reftests/font-features/kerning-spaces-tnr-kern.html
layout/reftests/font-features/kerning-spaces-tnr-nokern.html
layout/reftests/font-features/reftest.list
layout/reftests/font-features/spacelookups-wordcache-ref.html
layout/reftests/font-features/spacelookups-wordcache.html
layout/reftests/font-features/spacelookups.html
layout/reftests/font-features/subsuper-nofallback-ref1.html
layout/reftests/mathml/mathscript-1.html
layout/reftests/mathml/mathscript-2.html
layout/reftests/mathml/ssty-1.html
layout/reftests/mathml/ssty-4-ref.html
layout/reftests/mathml/ssty-4.html
layout/reftests/text-transform/graphite-small-caps-1-ref.html
layout/reftests/text-transform/opentype-small-caps-1-ref.html
layout/reftests/text/auto-hyphenation-pl-1-ref.html
layout/reftests/text/auto-hyphenation-pl-1.html
layout/reftests/text/graphite-03b.html
layout/reftests/text/graphite-05-feat.html
layout/reftests/text/graphite-05-lang.html
layout/reftests/text/graphite-05-multipass.html
layout/reftests/text/graphite-05-ot-only.html
layout/reftests/text/graphite-05-simple.html
--- a/layout/generic/MathMLTextRunFactory.cpp
+++ b/layout/generic/MathMLTextRunFactory.cpp
@@ -562,17 +562,17 @@ MathMLTextRunFactory::RebuildTextRun(nsT
 
         User specified values of script size multiplier will change the scaling
         factor which mSSTYScriptLevel values correspond to.
 
         In the event that the script size multiplier actually makes things
         larger, no change is made.
 
         If the user doesn't want this to happen, all they need to do is set
-        style="-moz-font-feature-settings: 'ssty' 0"
+        style="font-feature-settings: 'ssty' 0"
       */
       if (scriptScaling <= (NS_MATHML_DEFAULT_SCRIPT_SIZE_MULTIPLIER +
                             (NS_MATHML_DEFAULT_SCRIPT_SIZE_MULTIPLIER*
                              NS_MATHML_DEFAULT_SCRIPT_SIZE_MULTIPLIER))/2) {
         // Currently only the first two ssty settings are used, so two is large
         // as we go
         sstyLevel = 2;
       } else if (scriptScaling <= NS_MATHML_DEFAULT_SCRIPT_SIZE_MULTIPLIER) {
--- a/layout/reftests/counter-style/ref-common.css
+++ b/layout/reftests/counter-style/ref-common.css
@@ -1,12 +1,11 @@
 body {
   /* to match ua.css, see bug 1020143 */
-  -moz-font-feature-settings: "tnum";
-  font-feature-settings: "tnum";
+  font-variant-numeric: tabular-nums;
 }
 div, p {
   padding: 0; margin: 0;
   line-height: 150%;
   float: left;
 }
 p {
   padding-right: .5em;
--- a/layout/reftests/counter-style/test-common.css
+++ b/layout/reftests/counter-style/test-common.css
@@ -1,12 +1,11 @@
 body {
   /* to match ua.css, see bug 1020143 */
-  -moz-font-feature-settings: "tnum";
-  font-feature-settings: "tnum";
+  font-variant-numeric: tabular-nums;
 }
 ol, ul, section, p {
   padding: 0; margin: 0;
   line-height: 150%;
 }
 ol, ul {
   list-style-position: inside;
 }
--- a/layout/reftests/counters/counter-suffix-ref.html
+++ b/layout/reftests/counters/counter-suffix-ref.html
@@ -2,18 +2,17 @@
 <style>
   p, span { margin: 0; padding: 0; line-height: 150%; }
   #wrapper { width: 10em; }
   span {
     display: inline-block;
     width: 3em;
     text-align: end;
     box-sizing: border-box;
-    -moz-font-feature-settings: "tnum"; /* to match ua.css, see bug 1020143 */
-    font-feature-settings: "tnum";
+    font-variant-numeric: tabular-nums;
   }
 </style>
 <div id="wrapper">
   <p>
     <span>1.&nbsp;</span>foo<br>
     <span>2.&nbsp;</span>bar
   </p>
   <p>
--- a/layout/reftests/font-features/alternates-order-ref.html
+++ b/layout/reftests/font-features/alternates-order-ref.html
@@ -9,17 +9,17 @@
 body {
   font-family: libertine, sans-serif;
   font-size: 800%;
   line-height: 1.2em;
 }
 
 div { margin: 0 20px; }
 span {
-  -moz-font-feature-settings: "ss05"; /* crossed W */
+  font-feature-settings: "ss05"; /* crossed W */
 }
 
 </style>
 </head>
 <body lang="en">
 <div><span id="test1">W</span> <span id="test2">W</span> <span id="test3">W</span></div>
 <div><span id="test4">W</span> <span id="test5">W</span> <span id="test6">W</span></div>
 <div><span id="test7">W</span> <span id="test8">W</span> <span id="test9">W</span></div>
--- a/layout/reftests/font-features/alternates-order.html
+++ b/layout/reftests/font-features/alternates-order.html
@@ -5,23 +5,23 @@
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
 }
 
 @font-face {
   font-family: fontA;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-feature-settings: "ss05" on;
+  font-feature-settings: "ss05" on;
 }
 
 @font-face {
   font-family: fontB;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-feature-settings: "ss05" off;
+  font-feature-settings: "ss05" off;
 }
 
 @font-feature-values libertine {
   @styleset { 
     crossed-doubleu: 5;
     somethingElse: 4;
   }
 }
@@ -44,17 +44,17 @@
 }
 
 body {
   font-family: libertine, sans-serif;
   font-size: 800%;
   line-height: 1.2em;
 }
 
-/* -moz-font-feature-settings: "ss05"; crossed W */
+/* font-feature-settings: "ss05"; crossed W */
 
 div { margin: 0 20px; }
 
 #test1 {
   font-variant-alternates: styleset(crossed-doubleu);
 }
 
 #test2 {
@@ -79,24 +79,24 @@ div { margin: 0 20px; }
   /* testing font-specificity of feature value rule */
   font-family: fontA;
   font-variant-alternates: styleset(defined-for-fontB);
 }
 
 #test6 {
   /* testing one feature doesn't affect another */
   font-variant-alternates: styleset(somethingElse);
-  -moz-font-feature-settings: "ss05" on;
+  font-feature-settings: "ss05" on;
 }
 
 #test7 {
   /* testing font-specificity of feature value rule */
   font-family: fontA;
   font-variant-alternates: styleset(scriptJ);
-  -moz-font-feature-settings: "ss06";
+  font-feature-settings: "ss06";
 }
 
 #test8 {
   /* testing that an undefined value doesn't affect the results */
   font-family: fontB;
   font-variant-alternates: styleset(scriptJ, somethingUndefined, defined-for-fontB);
 }
 
--- a/layout/reftests/font-features/annotations-ref.html
+++ b/layout/reftests/font-features/annotations-ref.html
@@ -12,47 +12,47 @@ body {
   font-family: Hiragino Maru Gothic ProN, Meiryo;
 }
 
 /* for platforms without these fonts the default glyphs will show */
 
 @font-face {
   font-family: testMeiryo-circled;
   src: local(Meiryo);
-  -moz-font-feature-settings: "nalt" 4;
+  font-feature-settings: "nalt" 4;
 }
 
 @font-face {
   font-family: testMeiryo-black-circled;
   src: local(Meiryo);
-  -moz-font-feature-settings: "nalt" 5;
+  font-feature-settings: "nalt" 5;
 }
 
 @font-face {
   font-family: testMeiryo-rounded-box;
   src: local(Meiryo);
-  -moz-font-feature-settings: "nalt" 9;
+  font-feature-settings: "nalt" 9;
 }
 
 @font-face {
   font-family: testHiraginoMaru-circled;
   src: local(HiraMaruProN-W4), local(Hiragino Maru Gothic ProN W4);
-  -moz-font-feature-settings: "nalt" 1;
+  font-feature-settings: "nalt" 1;
 }
 
 @font-face {
   font-family: testHiraginoMaru-black-circled;
   src: local(HiraMaruProN-W4), local(Hiragino Maru Gothic ProN W4);
-  -moz-font-feature-settings: "nalt" 4;
+  font-feature-settings: "nalt" 4;
 }
 
 @font-face {
   font-family: testHiraginoMaru-rounded-box;
   src: local(HiraMaruProN-W4), local(Hiragino Maru Gothic ProN W4);
-  -moz-font-feature-settings: "nalt" 10;
+  font-feature-settings: "nalt" 10;
 }
 
 #test1 {
   font-family: testHiraginoMaru-circled, testMeiryo-circled;
 }
 
 #test2 {
   font-family: testHiraginoMaru-black-circled, testMeiryo-black-circled;
--- a/layout/reftests/font-features/font-features-across-space-1-ref.html
+++ b/layout/reftests/font-features/font-features-across-space-1-ref.html
@@ -11,20 +11,17 @@
 
 td {
   padding: 10px 5px;
 }
 
 .test {
   font-family: ligsym;
   font-size: 150%;
-  -moz-font-feature-settings: "liga=1";
-  -moz-font-feature-settings: "liga" on;
   -webkit-font-feature-settings: "liga" on;
-  -ms-font-feature-settings: "liga" on;
   -o-font-feature-settings: "liga" on;
   font-feature-settings: "liga" on;
 }
 </style>
 </head>
 
 <body>
 
--- a/layout/reftests/font-features/font-features-across-space-1.html
+++ b/layout/reftests/font-features/font-features-across-space-1.html
@@ -11,20 +11,17 @@
 
 td {
   padding: 10px 5px;
 }
 
 .test {
   font-family: ligsym;
   font-size: 150%;
-  -moz-font-feature-settings: "liga=1";
-  -moz-font-feature-settings: "liga" on;
   -webkit-font-feature-settings: "liga" on;
-  -ms-font-feature-settings: "liga" on;
   -o-font-feature-settings: "liga" on;
   font-feature-settings: "liga" on;
 }
 </style>
 </head>
 
 <body>
 
--- a/layout/reftests/font-features/font-features-hlig-2.html
+++ b/layout/reftests/font-features/font-features-hlig-2.html
@@ -1,15 +1,15 @@
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-feature-settings: "hlig";
+  font-feature-settings: "hlig";
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
 }
 </style>
 </head>
--- a/layout/reftests/font-features/font-features-hlig-3.html
+++ b/layout/reftests/font-features/font-features-hlig-3.html
@@ -1,20 +1,20 @@
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-feature-settings: "hlig";
+  font-feature-settings: "hlig";
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-feature-settings: "hlig" off, "liga" off;
+  font-feature-settings: "hlig" off, "liga" off;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-hlig-4.html
+++ b/layout/reftests/font-features/font-features-hlig-4.html
@@ -1,20 +1,20 @@
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-feature-settings: "hlig" off;
+  font-feature-settings: "hlig" off;
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-feature-settings: "hlig" on;
+  font-feature-settings: "hlig" on;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-hlig-5.html
+++ b/layout/reftests/font-features/font-features-hlig-5.html
@@ -1,20 +1,20 @@
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-feature-settings: "hlig";
+  font-feature-settings: "hlig";
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-feature-settings: "hlig" off;
+  font-feature-settings: "hlig" off;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-hlig.html
+++ b/layout/reftests/font-features/font-features-hlig.html
@@ -4,16 +4,16 @@
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-feature-settings: "hlig" on;
+  font-feature-settings: "hlig" on;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-noliga.html
+++ b/layout/reftests/font-features/font-features-noliga.html
@@ -4,16 +4,16 @@
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-feature-settings: "liga" 0;
+  font-feature-settings: "liga" 0;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
deleted file mode 100644
--- a/layout/reftests/font-features/font-features-oldsyntax-1.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-@font-face {
-  font-family: libertine;
-  src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-}
-body {
-  font-family: libertine, sans-serif;
-  font-size: 400%;
-  line-height: 2em;
-  -moz-font-feature-settings: "hlig=1";
-  -moz-font-feature-settings: "hlig" off;
-}
-</style>
-</head>
-<body lang="en">
-fastest firefox
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/font-features/font-features-oldsyntax-2.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-@font-face {
-  font-family: libertine;
-  src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-}
-body {
-  font-family: libertine, sans-serif;
-  font-size: 400%;
-  line-height: 2em;
-  -moz-font-feature-settings: "hlig" off;
-  -moz-font-feature-settings: "hlig=1";
-}
-</style>
-</head>
-<body lang="en">
-fastest firefox
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/font-features/font-features-oldsyntax-3.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-@font-face {
-  font-family: libertine;
-  src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-}
-body {
-  font-family: libertine, sans-serif;
-  font-size: 400%;
-  line-height: 2em;
-  -moz-font-feature-settings: "hlig=0";
-  -moz-font-feature-settings: "hlig";
-}
-</style>
-</head>
-<body lang="en">
-fastest firefox
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/font-features/font-features-oldsyntax-4.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-@font-face {
-  font-family: libertine;
-  src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-}
-body {
-  font-family: libertine, sans-serif;
-  font-size: 400%;
-  line-height: 2em;
-  -moz-font-feature-settings: "hlig";
-  -moz-font-feature-settings: "hlig=0";
-}
-</style>
-</head>
-<body lang="en">
-fastest firefox
-</body>
-</html>
--- a/layout/reftests/font-features/font-features-order-1.html
+++ b/layout/reftests/font-features/font-features-order-1.html
@@ -5,16 +5,16 @@
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-feature-settings: "liga" 0, "liga" 1;
+  font-feature-settings: "liga" 0, "liga" 1;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-order-2.html
+++ b/layout/reftests/font-features/font-features-order-2.html
@@ -5,16 +5,16 @@
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-feature-settings: "liga" 1, "liga" 0;
+  font-feature-settings: "liga" 1, "liga" 0;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-order-3.html
+++ b/layout/reftests/font-features/font-features-order-3.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-feature-settings: "liga" on, "hlig" on;
+  font-feature-settings: "liga" on, "hlig" on;
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
   /* font feature settings property should override font setting */
-  -moz-font-feature-settings: "liga" off, "hlig" off;
+  font-feature-settings: "liga" off, "hlig" off;
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-turkish-override-1.html
+++ b/layout/reftests/font-features/font-features-turkish-override-1.html
@@ -4,16 +4,16 @@
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-language-override: "TRK";
+  font-language-override: "TRK";
 }
 </style>
 </head>
 <body lang="en">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-turkish-override-2.html
+++ b/layout/reftests/font-features/font-features-turkish-override-2.html
@@ -1,15 +1,15 @@
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-language-override: "TRK";
+  font-language-override: "TRK";
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
 }
 </style>
 </head>
--- a/layout/reftests/font-features/font-features-turkish-override-3.html
+++ b/layout/reftests/font-features/font-features-turkish-override-3.html
@@ -4,16 +4,16 @@
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-language-override: "ENG";
+  font-language-override: "ENG";
 }
 </style>
 </head>
 <body lang="tr">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/font-features-turkish-override-4.html
+++ b/layout/reftests/font-features/font-features-turkish-override-4.html
@@ -1,15 +1,15 @@
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-language-override: "ENG";
+  font-language-override: "ENG";
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
 }
 </style>
 </head>
--- a/layout/reftests/font-features/font-features-turkish-override-5.html
+++ b/layout/reftests/font-features/font-features-turkish-override-5.html
@@ -1,20 +1,20 @@
 <html>
 <head>
 <style type="text/css">
 @font-face {
   font-family: libertine;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff) format("woff");
-  -moz-font-language-override: "ENG";
+  font-language-override: "ENG";
 }
 body {
   font-family: libertine, sans-serif;
   font-size: 400%;
   line-height: 2em;
-  -moz-font-language-override: "TRK";
+  font-language-override: "TRK";
 }
 </style>
 </head>
 <body lang="de">
 fastest firefox
 </body>
 </html>
--- a/layout/reftests/font-features/fwid-spaces.html
+++ b/layout/reftests/font-features/fwid-spaces.html
@@ -7,17 +7,16 @@
 <style type="text/css">
 
 body {
   margin: 5px;
 }
 
 #test, #test pre {
   font: 150% Hiragino Kaku Gothic ProN, Meiryo, sans-serif;
-  -moz-font-feature-settings: "fwid" on;
   -webkit-font-feature-settings: "fwid" on;
   font-feature-settings: "fwid" on;
 }
 
 #test pre span {
   background-color: red;
 }
 
--- a/layout/reftests/font-features/kerning-sanity-check-kern.html
+++ b/layout/reftests/font-features/kerning-sanity-check-kern.html
@@ -14,17 +14,16 @@
 body {
   margin: 5px;
 }
 
 div#test, div#test pre {
   font-family: Arial, LinuxLibertine, sans-serif;
   font-size: 300%;
   line-height: 1.1em;
-  -moz-font-feature-settings: "kern" on;
   -webkit-font-feature-settings: "kern" on;
   font-feature-settings: "kern" on;
 }
 
 pre {
   margin: 0;
   padding: 0;
 }
--- a/layout/reftests/font-features/kerning-sanity-check-nokern.html
+++ b/layout/reftests/font-features/kerning-sanity-check-nokern.html
@@ -14,17 +14,16 @@
 body {
   margin: 5px;
 }
 
 div#test, div#test pre {
   font-family: Arial, LinuxLibertine, sans-serif;
   font-size: 300%;
   line-height: 1.1em;
-  -moz-font-feature-settings: "kern" off;
   -webkit-font-feature-settings: "kern" off;
   font-feature-settings: "kern" off;
 }
 
 pre {
   margin: 0;
   padding: 0;
 }
--- a/layout/reftests/font-features/kerning-spaces-arial-kern.html
+++ b/layout/reftests/font-features/kerning-spaces-arial-kern.html
@@ -9,17 +9,16 @@
 body {
   margin: 5px;
 }
 
 div#test, div#test pre {
   font-family: Arial, sans-serif;
   font-size: 150%;
   line-height: 1.1em;
-  -moz-font-feature-settings: "kern" on;
   -webkit-font-feature-settings: "kern" on;
   font-feature-settings: "kern" on;
 }
 
 pre {
   margin: 0;
   padding: 0;
 }
--- a/layout/reftests/font-features/kerning-spaces-arial-nokern.html
+++ b/layout/reftests/font-features/kerning-spaces-arial-nokern.html
@@ -9,17 +9,16 @@
 body {
   margin: 5px;
 }
 
 div#test, div#test pre {
   font-family: Arial, sans-serif;
   font-size: 150%;
   line-height: 1.1em;
-  -moz-font-feature-settings: "kern" off;
   -webkit-font-feature-settings: "kern" off;
   font-feature-settings: "kern" off;
 }
 
 pre {
   margin: 0;
   padding: 0;
 }
--- a/layout/reftests/font-features/kerning-spaces-tnr-kern.html
+++ b/layout/reftests/font-features/kerning-spaces-tnr-kern.html
@@ -9,17 +9,16 @@
 body {
   margin: 5px;
 }
 
 div#test, div#test pre {
   font-family: Times New Roman, sans-serif;
   font-size: 150%;
   line-height: 1.1em;
-  -moz-font-feature-settings: "kern" on;
   -webkit-font-feature-settings: "kern" on;
   font-feature-settings: "kern" on;
 }
 
 pre {
   margin: 0;
   padding: 0;
 }
--- a/layout/reftests/font-features/kerning-spaces-tnr-nokern.html
+++ b/layout/reftests/font-features/kerning-spaces-tnr-nokern.html
@@ -9,17 +9,16 @@
 body {
   margin: 5px;
 }
 
 div#test, div#test pre {
   font-family: Times New Roman, sans-serif;
   font-size: 150%;
   line-height: 1.1em;
-  -moz-font-feature-settings: "kern" off;
   -webkit-font-feature-settings: "kern" off;
   font-feature-settings: "kern" off;
 }
 
 pre {
   margin: 0;
   padding: 0;
 }
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -27,27 +27,21 @@ HTTP(..) == font-features-turkish.html f
 HTTP(..) == font-features-hlig-2.html font-features-hlig.html
 HTTP(..) == font-features-hlig-4.html font-features-hlig.html
 HTTP(..) != font-features-hlig-5.html font-features-hlig.html
 HTTP(..) == font-features-ligatures-none.html font-features-noliga.html
 
 # check that feature in style rule overrides @font-face
 skip-if(B2G) HTTP(..) == font-features-hlig-3.html font-features-noliga.html # bug 773482
 
-# make sure old syntax usage never interferes with new syntax usage
-HTTP(..) == font-features-oldsyntax-1.html font-features-ref.html
-HTTP(..) == font-features-oldsyntax-2.html font-features-ref.html
-HTTP(..) == font-features-oldsyntax-3.html font-features-hlig.html
-HTTP(..) == font-features-oldsyntax-4.html font-features-hlig.html
-
-# compare -moz-font-language-override rendering to lang-tagged rendering
+# compare font-language-override rendering to lang-tagged rendering
 skip-if(B2G) HTTP(..) == font-features-turkish-override-1.html font-features-turkish.html # bug 773482
 HTTP(..) == font-features-turkish-override-2.html font-features-turkish.html
 
-# check use of -moz-font-language-override to override explicit lang tag
+# check use of font-language-override to override explicit lang tag
 HTTP(..) == font-features-turkish-override-3.html font-features-ref.html
 HTTP(..) == font-features-turkish-override-4.html font-features-ref.html
 skip-if(B2G) HTTP(..) == font-features-turkish-override-5.html font-features-turkish.html # bug 773482
 
 # check that last value wins if a feature is repeated
 HTTP(..) == font-features-order-1.html font-features-ref.html
 HTTP(..) == font-features-order-2.html font-features-noliga.html
 
--- a/layout/reftests/font-features/spacelookups-wordcache-ref.html
+++ b/layout/reftests/font-features/spacelookups-wordcache-ref.html
@@ -49,23 +49,21 @@ p { margin: 0; line-height: 1.2; }
 .spacelookup-defscr-deflang-ndeffeat { font-family: spacelookup-defscr-deflang-ndeffeat; }
 .spacelookup-latnscr-deflang-deffeat { font-family: spacelookup-latnscr-deflang-deffeat; }
 .spacelookup-latnscr-deflang-ndeffeat { font-family: spacelookup-latnscr-deflang-ndeffeat; }
 .spacelookup-latnscr-fralang-deffeat { font-family: spacelookup-latnscr-fralang-deffeat; }
 .spacelookup-latnscr-fralang-ndeffeat { font-family: spacelookup-latnscr-fralang-ndeffeat; }
 
 p.kern {
   -webkit-font-feature-settings: "liga" on, "kern" on;
-  -moz-font-feature-settings: "liga" on, "kern" on;
   font-feature-settings: "liga" on, "kern" on;
 }
 
 p.nokern {
   -webkit-font-feature-settings: "liga" on, "kern" off;
-  -moz-font-feature-settings: "liga" on, "kern" off;
   font-feature-settings: "liga" on, "kern" off;
 }
 
 </style>
 
 </head>
 <body>
 <div class="spacelookup-defscr-deflang-deffeat" lang="en">
--- a/layout/reftests/font-features/spacelookups-wordcache.html
+++ b/layout/reftests/font-features/spacelookups-wordcache.html
@@ -50,17 +50,16 @@ p { margin: 0; line-height: 1.2; }
 .spacelookup-defscr-deflang-ndeffeat { font-family: spacelookup-defscr-deflang-ndeffeat; }
 .spacelookup-latnscr-deflang-deffeat { font-family: spacelookup-latnscr-deflang-deffeat; }
 .spacelookup-latnscr-deflang-ndeffeat { font-family: spacelookup-latnscr-deflang-ndeffeat; }
 .spacelookup-latnscr-fralang-deffeat { font-family: spacelookup-latnscr-fralang-deffeat; }
 .spacelookup-latnscr-fralang-ndeffeat { font-family: spacelookup-latnscr-fralang-ndeffeat; }
 
 .dlig {
   -webkit-font-feature-settings: "dlig" on;
-  -moz-font-feature-settings: "dlig" on;
   font-feature-settings: "dlig" on;
 }
 </style>
 
 </head>
 <body>
 <div class="spacelookup-defscr-deflang-deffeat" lang="en">
 <p class="spacelookup-defscr-deflang-deffeat">latn-script default-script fra-lang default-lang non-default-feature default-feature</p>
--- a/layout/reftests/font-features/spacelookups.html
+++ b/layout/reftests/font-features/spacelookups.html
@@ -59,17 +59,16 @@ div { font-size: 400%; }
 .spacelookup-defscr-deflang-ndeffeat { font-family: spacelookup-defscr-deflang-ndeffeat; }
 .spacelookup-latnscr-deflang-deffeat { font-family: spacelookup-latnscr-deflang-deffeat; }
 .spacelookup-latnscr-deflang-ndeffeat { font-family: spacelookup-latnscr-deflang-ndeffeat; }
 .spacelookup-latnscr-fralang-deffeat { font-family: spacelookup-latnscr-fralang-deffeat; }
 .spacelookup-latnscr-fralang-ndeffeat { font-family: spacelookup-latnscr-fralang-ndeffeat; }
 
 .dlig {
   -webkit-font-feature-settings: "dlig" on;
-  -moz-font-feature-settings: "dlig" on;
   font-feature-settings: "dlig" on;
 }
 </style>
 
 </head>
 <body>
 <div class="spacelookup-defscr-deflang-deffeat">
 <span class="spacelookup-defscr-deflang-deffeat">default-script default-lang default-feature</span>
--- a/layout/reftests/font-features/subsuper-nofallback-ref1.html
+++ b/layout/reftests/font-features/subsuper-nofallback-ref1.html
@@ -17,22 +17,20 @@ body {
 }
 
 p {
   margin: 0;
   font-size: 75px;
 }
 h4 { font-weight: normal }
 span.super {
-  -moz-font-feature-settings: "sups" on;
   -webkit-font-feature-settings: "sups" on;
   font-feature-settings: "sups" on;
 }
 span.sub {
-  -moz-font-feature-settings: "subs" on;
   -webkit-font-feature-settings: "subs" on;
   font-feature-settings: "subs" on;
 }
 
 </style>
 </head>
 <body>
 <h4>All the subscripts and superscripts should display with variant glyphs:</h4>
--- a/layout/reftests/mathml/mathscript-1.html
+++ b/layout/reftests/mathml/mathscript-1.html
@@ -6,32 +6,32 @@
       src: url("mathssty.woff");
     }
   </style>
 </head>
 <body>
 
   <!-- Demonstrate that it has no effect outside MathML -->
   <div style="font-family: 'mathssty'; 
-              -moz-font-feature-settings: 'ssty' 1">A</div>
+              font-feature-settings: 'ssty' 1">A</div>
   <div style="font-family: 'mathssty'; 
-              -moz-font-feature-settings: 'ssty' 2">A</div>
+              font-feature-settings: 'ssty' 2">A</div>
 
   <!-- Demonstrate that it works within MathML -->
   <math>
     <mstyle style="font-family: 'mathssty';">
     <mrow>
-      <mo style="-moz-font-feature-settings: 'ssty' 0">A</mo>
-      <mo style="-moz-font-feature-settings: 'ssty' 1">A</mo>
-      <mo style="-moz-font-feature-settings: 'ssty' 2">A</mo>
+      <mo style="font-feature-settings: 'ssty' 0">A</mo>
+      <mo style="font-feature-settings: 'ssty' 1">A</mo>
+      <mo style="font-feature-settings: 'ssty' 2">A</mo>
     </mrow>
     </mstyle>
   </math>
   <p>
   <!-- verify it works for the other elements except mtext -->
   <math>
-    <mstyle style="font-family: 'mathssty'; -moz-font-feature-settings: 'ssty' 2">
+    <mstyle style="font-family: 'mathssty'; font-feature-settings: 'ssty' 2">
       <mi mathvariant="normal">A</mi>
       <mn>A</mn>
       <mtext>A</mtext>
     </mstyle>
   </math>
 </body>
--- a/layout/reftests/mathml/mathscript-2.html
+++ b/layout/reftests/mathml/mathscript-2.html
@@ -9,21 +9,21 @@
       src: url("mathssty.woff");
     }
   </style>
   </head>
   <body>
 
   <!-- Demonstrate that it has no effect outside MathML -->
   <div style="font-family: 'mathssty';
-              -moz-font-feature-settings: 'ssty' " id="div0">A</div>
+              font-feature-settings: 'ssty' " id="div0">A</div>
 
   <!-- Demonstrate that it works within MathML -->
   <math>
-    <mstyle style="font-family: 'mathssty'; -moz-font-feature-settings: 'ssty' 2">
+    <mstyle style="font-family: 'mathssty'; font-feature-settings: 'ssty' 2">
       <mo id="mo0">A</mo>
     </mstyle>
   </math>
 
   <script>
     function doTest()
     {
       // Does nothing to non-MathML
--- a/layout/reftests/mathml/ssty-1.html
+++ b/layout/reftests/mathml/ssty-1.html
@@ -275,50 +275,50 @@
   <p>
 
   <!-- User set ssty font feature setting overrides automatically set ssty -->
   <math>
     <mstyle style="font-family: 'sstyfont';">
       <msup>
         <mo>A</mo>
         <msup>
-          <mo style="-moz-font-feature-settings: 'ssty' 0">A</mo>
+          <mo style="font-feature-settings: 'ssty' 0">A</mo>
           <mo>A</mo>
         </msup>
       </msup>
 
       <msub>
         <mo>A</mo>
         <msub>
-          <mo style="-moz-font-feature-settings: 'ssty' 0">A</mo>
+          <mo style="font-feature-settings: 'ssty' 0">A</mo>
           <mo>A</mo>
         </msub>
       </msub>
 
       <msubsup>
         <mo>A</mo>
         <msubsup>
-          <mo style="-moz-font-feature-settings: 'ssty' 0">A</mo>
+          <mo style="font-feature-settings: 'ssty' 0">A</mo>
           <mo>A</mo>
           <mo>A</mo>
         </msubsup>
         <msubsup>
-          <mo style="-moz-font-feature-settings: 'ssty' 0">A</mo>
+          <mo style="font-feature-settings: 'ssty' 0">A</mo>
           <mo>A</mo>
           <mo>A</mo>
         </msubsup>
       </msubsup>
 
       <mmultiscripts>
         <mo>A</mo>
         <mmultiscripts>
-          <mo style="-moz-font-feature-settings: 'ssty' 0">A</mo>
+          <mo style="font-feature-settings: 'ssty' 0">A</mo>
           <mo>A</mo>
           <mo>A</mo>
         </mmultiscripts>
         <mmultiscripts>
-          <mo style="-moz-font-feature-settings: 'ssty' 0">A</mo>
+          <mo style="font-feature-settings: 'ssty' 0">A</mo>
           <mo>A</mo>
           <mo>A</mo>
         </mmultiscripts>
       </mmultiscripts>
     </mstyle>
   </math>
--- a/layout/reftests/mathml/ssty-4-ref.html
+++ b/layout/reftests/mathml/ssty-4-ref.html
@@ -134,17 +134,17 @@
         </mfrac>
       </mfrac>
     </mstyle>
   </math>
 
   <p>
 
   <math>
-    <mstyle id="mstyle5" style ="font-family: 'sstyfont';  -moz-font-feature-settings: 'ssty' 0">
+    <mstyle id="mstyle5" style ="font-family: 'sstyfont';  font-feature-settings: 'ssty' 0">
       <mfrac>
         <mfrac>
           <mo>D</mo>
           <mo>D</mo>
         </mfrac>
         <mfrac>
            <mo>D</mo>
            <mo>D</mo>
--- a/layout/reftests/mathml/ssty-4.html
+++ b/layout/reftests/mathml/ssty-4.html
@@ -114,17 +114,17 @@
         </mrow>
       </mfrac>
     </mstyle>
   </math>
 
  <p>
 
   <math>
-    <mstyle id="mstyle4" style ="font-family: 'sstyfont'; -moz-font-feature-settings: 'ssty' 0">
+    <mstyle id="mstyle4" style ="font-family: 'sstyfont'; font-feature-settings: 'ssty' 0">
       <mfrac>
         <mfrac>
           <mo>A</mo>
           <mo>A</mo>
         </mfrac>
         <mfrac>
            <mo>A</mo>
            <mo>A</mo>
@@ -171,16 +171,16 @@
         var mo1 = document.createElementNS("http://www.w3.org/1998/Math/MathML", "mo");
         mo1.innerHTML = "A";
         document.getElementById("mrow0").appendChild(mo1);
         // removing explicit ssty setting works
         document.getElementById("mstyle4").setAttribute(
           "style", "font-family: 'sstyfont';")
         // setting an explicit ssty font feature 
         document.getElementById("mstyle5").setAttribute(
-          "style" , "font-family: 'sstyfont'; -moz-font-feature-settings: 'ssty' 0")
+          "style" , "font-family: 'sstyfont'; font-feature-settings: 'ssty' 0")
 
         document.documentElement.removeAttribute("class");
       }
       window.addEventListener("MozReftestInvalidate", doTest, false);
     </script>
   </body>
 </html>
--- a/layout/reftests/text-transform/graphite-small-caps-1-ref.html
+++ b/layout/reftests/text-transform/graphite-small-caps-1-ref.html
@@ -7,17 +7,16 @@
 @font-face {
   font-family: test;
   src: url(../fonts/sil/CharisSIL-R.ttf);
 }
 body {
   font: 100px test;
 }
 div {
-  -moz-font-feature-settings: 'smcp' on;
   font-feature-settings: 'smcp' on;
 }
 </style>
 </head>
 <body>
 <div>Small Caps
 </body>
 </html>
--- a/layout/reftests/text-transform/opentype-small-caps-1-ref.html
+++ b/layout/reftests/text-transform/opentype-small-caps-1-ref.html
@@ -7,17 +7,16 @@
 @font-face {
   font-family: test;
   src: url(../fonts/LinLibertine_Re-4.7.5.woff);
 }
 body {
   font: 100px test;
 }
 div {
-  -moz-font-feature-settings: 'smcp' on;
   font-feature-settings: 'smcp' on;
 }
 </style>
 </head>
 <body>
 <div>Small Caps
 </body>
 </html>
--- a/layout/reftests/text/auto-hyphenation-pl-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-pl-1-ref.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
 <html lang="pl">
 <head>
 <meta charset="utf-8">
 <title>Polish hyphenation test</title>
 <style>
 body {
   font-family: "Times New Roman", serif; /* prefer TNR to Times (default) on OS X... */
-  -moz-font-feature-settings: 'kern' off; /* ...so that we can disable kerning */
   font-feature-settings: 'kern' off;
 }
 </style>
 </head>
 <body>
 <div style="white-space:pre-wrap;">Uni-
 kod
 przy-
--- a/layout/reftests/text/auto-hyphenation-pl-1.html
+++ b/layout/reftests/text/auto-hyphenation-pl-1.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
 <html lang="pl">
 <head>
 <meta charset="utf-8">
 <title>Polish hyphenation test</title>
 <style>
 body {
   font-family: "Times New Roman", serif; /* prefer TNR to Times (default) on OS X... */
-  -moz-font-feature-settings: 'kern' off; /* ...so that we can disable kerning */
   font-feature-settings: 'kern' off;
 }
 </style>
 </head>
 <body>
 <div style="width:0pt; -moz-hyphens:auto">
 Unikod przypisuje unikalny numer każdemu znakowi,
 niezależny od używanej platformy,
--- a/layout/reftests/text/graphite-03b.html
+++ b/layout/reftests/text/graphite-03b.html
@@ -5,17 +5,16 @@
 <style type="text/css">
 @font-face {
   font-family: padauk;
   src: url(../fonts/sil/Padauk.ttf);
 }
 
 body {
   font: 34px padauk;
-  -moz-font-feature-settings: "kdot" on;
   font-feature-settings: "kdot" on;
     /* check that setting an optional graphite feature affects rendering:
      * this adds "dots" to the ends of a number of curved strokes
      */
 }
 </style>
 </head>
 <body>
--- a/layout/reftests/text/graphite-05-feat.html
+++ b/layout/reftests/text/graphite-05-feat.html
@@ -5,17 +5,17 @@
 @font-face {
   font-family: test;
   src: url(../fonts/graphite/grtest-langfeat.ttf);
 }
 
 body {
   margin: 20px;
   font: 100px test;
-  -moz-font-feature-settings: "TST1", "FTP2";
+  font-feature-settings: "TST1", "FTP2";
 }
 p { margin: 0; padding: 0; }
 </style>
 </head>
 <body>
 <p>FAIL</p>
 </body>
 </html>
--- a/layout/reftests/text/graphite-05-lang.html
+++ b/layout/reftests/text/graphite-05-lang.html
@@ -5,17 +5,17 @@
 @font-face {
   font-family: test;
   src: url(../fonts/graphite/grtest-langfeat.ttf);
 }
 
 body {
   margin: 20px;
   font: 100px test;
-  -moz-font-feature-settings: "TST1";
+  font-feature-settings: "TST1";
 }
 p { margin: 0; padding: 0; }
 </style>
 </head>
 <body>
 <p lang="fr">FAIL</p>
 </body>
 </html>
--- a/layout/reftests/text/graphite-05-multipass.html
+++ b/layout/reftests/text/graphite-05-multipass.html
@@ -5,17 +5,17 @@
 @font-face {
   font-family: test;
   src: url(../fonts/graphite/grtest-multipass.ttf);
 }
 
 body {
   margin: 20px;
   font: 100px test;
-  -moz-font-feature-settings: "TST1";
+  font-feature-settings: "TST1";
 }
 p { margin: 0; padding: 0; }
 </style>
 </head>
 <body>
 <p>FAIL</p>
 </body>
 </html>
--- a/layout/reftests/text/graphite-05-ot-only.html
+++ b/layout/reftests/text/graphite-05-ot-only.html
@@ -5,17 +5,17 @@
 @font-face {
   font-family: test;
   src: url(../fonts/graphite/grtest-ot-only.ttf);
 }
 
 body {
   margin: 20px;
   font: 100px test;
-  -moz-font-feature-settings: "TST1";
+  font-feature-settings: "TST1";
 }
 p { margin: 0; padding: 0; }
 </style>
 </head>
 <body>
 <p>FAIL</p>
 </body>
 </html>
--- a/layout/reftests/text/graphite-05-simple.html
+++ b/layout/reftests/text/graphite-05-simple.html
@@ -5,17 +5,17 @@
 @font-face {
   font-family: test;
   src: url(../fonts/graphite/grtest-simple.ttf);
 }
 
 body {
   margin: 20px;
   font: 100px test;
-  -moz-font-feature-settings: "TST1";
+  font-feature-settings: "TST1";
 }
 p { margin: 0; padding: 0; }
 </style>
 </head>
 <body>
 <p>FAIL</p>
 </body>
 </html>