Bug 563023 - fix font lists in test and reference pages to be more consistent. r=zweinberg
authorJonathan Kew <jfkthame@gmail.com>
Sat, 15 May 2010 15:55:23 +0100
changeset 42354 0d770349f17fcc6e76e4aafe4e8c36e4693ee475
parent 42353 6f0fe1119d4b6a657582ed38e041af4e60d5309c
child 42355 76240f6a38ae0d97095a7ce176e7ed14301a7a4a
push id13294
push userjkew@mozilla.com
push dateSat, 15 May 2010 14:56:44 +0000
treeherdermozilla-central@0d770349f17f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerszweinberg
bugs563023
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 563023 - fix font lists in test and reference pages to be more consistent. r=zweinberg
layout/reftests/font-face/src-list-local-fallback-ref.html
layout/reftests/font-face/src-list-local-fallback.html
layout/reftests/font-face/src-list-local-full-quotes.html
layout/reftests/font-face/src-list-local-full-ref.html
layout/reftests/font-face/src-list-local-full.html
--- a/layout/reftests/font-face/src-list-local-fallback-ref.html
+++ b/layout/reftests/font-face/src-list-local-fallback-ref.html
@@ -9,17 +9,17 @@
 body {
   margin: 50px;
   font-size: 24pt;
   font-family: sans-serif;
 }
 
 p { margin-left: 1em; }
 
-p { font-family: Futura, Bitstream Vera Sans, Arial, serif; }
+p { font-family: Futura, Bitstream Vera Sans, DejaVu Sans, Arial, serif; }
 
 </style>
   
 <script type="text/javascript">
 
 </script>
   
 </head>
--- a/layout/reftests/font-face/src-list-local-fallback.html
+++ b/layout/reftests/font-face/src-list-local-fallback.html
@@ -11,37 +11,37 @@ body {
   font-size: 24pt;
   font-family: sans-serif;
 }
 
 p { margin-left: 1em; }
 
 @font-face {
   font-family: test0;
-  src: local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Arial"), local("DejaVu Sans");
+  src: local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("DejaVu Sans"), local("Arial");
 }
 
 @font-face {
   font-family: test1;
-  src: url(bogus-dir/bogus.ttf), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Arial"), local("DejaVu Sans");
+  src: url(bogus-dir/bogus.ttf), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("DejaVu Sans"), local("Arial");
 }
 
 @font-face {
   font-family: test2;
-  src: url(../fonts/README), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Arial"), local("DejaVu Sans");
+  src: url(../fonts/README), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("DejaVu Sans"), local("Arial");
 }
 
 @font-face {
   font-family: test3;
-  src: url(../fonts/README), local("Bogosity"), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Arial"), local("DejaVu Sans");
+  src: url(../fonts/README), local("Bogosity"), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("DejaVu Sans"), local("Arial");
 }
 
 @font-face {
   font-family: test4;
-  src: url(../fonts/README), local("Bogosity"), url(bogus-dir/bogus.ttf), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Arial"), local("DejaVu Sans");
+  src: url(../fonts/README), local("Bogosity"), url(bogus-dir/bogus.ttf), local("Futura-Medium"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("DejaVu Sans"), local("Arial");
 }
 
 #test0 { font-family: test0, serif; }
 #test1 { font-family: test1, serif; }
 #test2 { font-family: test2, serif; }
 #test3 { font-family: test3, serif; }
 #test4 { font-family: test4, serif; }
 
--- a/layout/reftests/font-face/src-list-local-full-quotes.html
+++ b/layout/reftests/font-face/src-list-local-full-quotes.html
@@ -10,28 +10,28 @@ body {
   margin: 50px;
   font-size: 24pt;
 }
 
 /* use full names */
 
 @font-face {
   font-family: test-regular;
-  src: local("Helvetica Neue"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Free Sans"), local("Arial"), local("SwissA"), local("DejaVu Sans");
+  src: local("Helvetica Neue"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Free Sans"), local("SwissA"), local("DejaVu Sans"), local("Arial");
 }
 
 /* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */
 @font-face {
   font-family: test-bold;
-  src: local("Helvetica Neue Bold"), local("Bitstream Vera Sans Bold"), local("Free Sans Bold"), local("Arial Bold"), local("SwissA Bold"), local("DejaVu Sans Bold");
+  src: local("Helvetica Neue Bold"), local("Bitstream Vera Sans Bold"), local("Free Sans Bold"), local("SwissA Bold"), local("DejaVu Sans Bold"), local("Arial Bold");
 }
 
 @font-face {
   font-family: test-italic;
-  src: local("Helvetica Neue Italic"), local("Bitstream Vera Sans Oblique"), local("Free Sans Oblique"), local("Arial Italic"), local("SwissA Italic"), local("DejaVu Sans Oblique");
+  src: local("Helvetica Neue Italic"), local("Bitstream Vera Sans Oblique"), local("Free Sans Oblique"), local("SwissA Italic"), local("DejaVu Sans Oblique"), local("Arial Italic");
 }
 
 .regular { font-family: test-regular, serif; }
 .bold { font-family: test-bold, serif; }
 .italic { font-family: test-italic, serif; }
 
 </style>
 
--- a/layout/reftests/font-face/src-list-local-full-ref.html
+++ b/layout/reftests/font-face/src-list-local-full-ref.html
@@ -8,17 +8,17 @@
 
 body {
   margin: 50px;
   font-size: 24pt;
 }
 
 /* use full names */
 
-p { font-family: Helvetica Neue, Bitstream Vera Sans, FreeSans, Arial, SwissA, serif; }
+p { font-family: Helvetica Neue, Bitstream Vera Sans, FreeSans, SwissA, DejaVu Sans, Arial, serif; }
 
 .regular {  }
 .bold { font-weight: bold; }
 .italic { font-style: italic; }
 
 </style>
   
 <script type="text/javascript">
--- a/layout/reftests/font-face/src-list-local-full.html
+++ b/layout/reftests/font-face/src-list-local-full.html
@@ -10,28 +10,28 @@ body {
   margin: 50px;
   font-size: 24pt;
 }
 
 /* use full names */
 
 @font-face {
   font-family: test-regular;
-  src: local(Helvetica Neue), local(Bitstream Vera Sans), local(Bitstream Vera Sans Roman), local(Free Sans), local(Arial), local(SwissA), local(DejaVu Sans);
+  src: local(Helvetica Neue), local(Bitstream Vera Sans), local(Bitstream Vera Sans Roman), local(Free Sans), local(SwissA), local(DejaVu Sans), local(Arial);
 }
 
 /* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */
 @font-face {
   font-family: test-bold;
-  src: local(Helvetica Neue Bold), local(Bitstream Vera Sans Bold), local(Free Sans Bold), local(Arial Bold), local(SwissA Bold), local(DejaVu Sans Bold);
+  src: local(Helvetica Neue Bold), local(Bitstream Vera Sans Bold), local(Free Sans Bold), local(SwissA Bold), local(DejaVu Sans Bold), local(Arial Bold);
 }
 
 @font-face {
   font-family: test-italic;
-  src: local(Helvetica Neue Italic), local(Bitstream Vera Sans Oblique), local(Free Sans Oblique), local(Arial Italic), local(SwissA Italic), local(DejaVu Sans Oblique);
+  src: local(Helvetica Neue Italic), local(Bitstream Vera Sans Oblique), local(Free Sans Oblique), local(SwissA Italic), local(DejaVu Sans Oblique), local(Arial Italic);
 }
 
 .regular { font-family: test-regular, serif; }
 .bold { font-family: test-bold, serif; }
 .italic { font-family: test-italic, serif; }
 
 </style>