| author | Karl Tomlinson <karlt+@karlt.net> |
| Fri, 26 Aug 2011 08:49:44 +1200 | |
| changeset 76170 | 2f4ba564a7583a934fa9129ccd2bd6e62f784ac3 |
| parent 76169 | 4c05b2f72ff17b225f8dcc6badc71b31e01b7a2a |
| child 76171 | a273f980f5a136cc85f0caebf41bd3b8c07a1e38 |
| push id | 21084 |
| push user | bmo@edmorley.co.uk |
| push date | Tue, 30 Aug 2011 11:14:24 +0000 |
| treeherder | mozilla-central@31b79d4e90f4 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| bugs | 678561 |
| milestone | 9.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
|
new file mode 100644 --- /dev/null +++ b/layout/reftests/text/font-selection-fallback-1-ref.html @@ -0,0 +1,42 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html lang="en"> +<head> + <title>Reference for test that language support doesn't override + specified family - Bug 678561</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <style type="text/css"> + + @font-face { + font-family: "MarkA"; + src: url(../fonts/markA.ttf); + } + @font-face { + font-family: "MarkB"; + src: url(../fonts/markB.ttf); + } + @font-face { + font-family: "DejaVu Sans Mono"; + src: url(../fonts/DejaVuSansMono.otf); + } + + .c1 { font-family: MarkA; } + .c2 { font-family: MarkB; } + .c3 { font-family: DejaVu Sans Mono; } + + /* to ensure the same vertical positioning of the text */ + .spacer { line-height: 3em } + </style> +</head> +<body> + +<p><span class="c1">A</span></p> +<p><span class="c2">B</span><span class="spacer"></span></p> +<p><span class="c3">C</span><span class="spacer"></span></p> + +<p class="c3">A</p> +<p class="c3">B</p> +<p class="c3">C</p> + +</body> +</html>
new file mode 100644 --- /dev/null +++ b/layout/reftests/text/font-selection-fallback-1.html @@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html lang="en"> +<head> + <title>Test that language support doesn't override specified family - Bug 678561</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <style type="text/css"> + + @font-face { + font-family: "MarkA"; + src: url(../fonts/markA.ttf); + } + @font-face { + font-family: "MarkB"; + src: url(../fonts/markB.ttf); + } + @font-face { + font-family: "DejaVu Sans Mono"; + src: url(../fonts/DejaVuSansMono.otf); + } + + .c1 { font-family: MarkA, MarkB, DejaVu Sans Mono; } + + .c2 { font-family: DejaVu Sans Mono, MarkA, MarkB; } + + /* to ensure the same vertical positioning of the text */ + .spacer { line-height: 3em } + </style> +</head> +<body> + +<p><span class="c1">A</span></p> +<p><span class="c1">B</span><span class="spacer"></span></p> +<p><span class="c1">C</span><span class="spacer"></span></p> + +<p class="c2">A</p> +<p class="c2">B</p> +<p class="c2">C</p> + +</body> +</html>
--- a/layout/reftests/text/reftest.list +++ b/layout/reftests/text/reftest.list @@ -1,10 +1,11 @@ fails-if(Android) == fallback-01.xhtml fallback-01-ref.xhtml == font-selection-by-lang-01.html font-selection-by-lang-01-ref.html +== font-selection-fallback-1.html font-selection-fallback-1-ref.html HTTP(..) == font-selection-generic-1.html font-selection-generic-1-ref.html fails-if(Android) != font-size-adjust-01.html font-size-adjust-01-ref.html # The following test passes consistently only on Mac OS X; # both Windows and Linux give results that vary depending on the font size/zoom factor used, # because hinting affects the metrics used to compute the font size adjustment. See bug 429605. random-if(!cocoaWidget) == font-size-adjust-02.html font-size-adjust-02-ref.html # This currently fails because line spacing does not respect font-size-adjust # in the "obvious" way, but it is unclear what the behavior should really be;