From d06313ef33a6980bf6f507f09ea0af6f7ae1230d Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 28 Jun 2012 10:59:39 +0100 Subject: [PATCH] bug 764805 - reftest for style descriptors on src:local font face. r=jdaggett --- layout/reftests/font-face/local-1-ref.html | 3 +- layout/reftests/font-face/local-1.html | 6 ++- .../font-face/local-styled-1-ref.html | 33 +++++++++++++ layout/reftests/font-face/local-styled-1.html | 49 +++++++++++++++++++ layout/reftests/font-face/reftest.list | 3 ++ 5 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 layout/reftests/font-face/local-styled-1-ref.html create mode 100644 layout/reftests/font-face/local-styled-1.html diff --git a/layout/reftests/font-face/local-1-ref.html b/layout/reftests/font-face/local-1-ref.html index bfe5ed45c25..854dee54953 100644 --- a/layout/reftests/font-face/local-1-ref.html +++ b/layout/reftests/font-face/local-1-ref.html @@ -7,7 +7,8 @@ diff --git a/layout/reftests/font-face/local-1.html b/layout/reftests/font-face/local-1.html index c0f7ec9358c..44c71938720 100644 --- a/layout/reftests/font-face/local-1.html +++ b/layout/reftests/font-face/local-1.html @@ -34,7 +34,8 @@ font-family: "Local"; src: local(Nimbus Sans L), local(NimbusSansL-Regu), local(Helvetica), local(Bitstream Vera Sans), - local(Arial), local(Liberation Sans), local(SwissA); + local(Arial), local(Liberation Sans), local(SwissA), + local(Droid Sans), local(Roboto); font-weight: 100; } @font-face { @@ -42,7 +43,8 @@ src: local(Nimbus Sans L Bold), local(NimbusSansL-Bold), local(Helvetica Bold), local(Helvetica-Bold), local(Bitstream Vera Sans Bold), - local(Arial Bold), local(Liberation Sans Bold), local(SwissA Bold); + local(Arial Bold), local(Liberation Sans Bold), local(SwissA Bold), + local(Droid Sans Bold), local(Roboto Bold); font-weight: normal; } body { font-family: Local, serif } diff --git a/layout/reftests/font-face/local-styled-1-ref.html b/layout/reftests/font-face/local-styled-1-ref.html new file mode 100644 index 00000000000..ff017a49916 --- /dev/null +++ b/layout/reftests/font-face/local-styled-1-ref.html @@ -0,0 +1,33 @@ + + + + + + +
+This serif font should NOT be used below. +
+
+
+These three lines should all use the same font face. +
+
+This line should NOT be bold. +
+
+This line should NOT be italic. +
+ + diff --git a/layout/reftests/font-face/local-styled-1.html b/layout/reftests/font-face/local-styled-1.html new file mode 100644 index 00000000000..a14719a36ae --- /dev/null +++ b/layout/reftests/font-face/local-styled-1.html @@ -0,0 +1,49 @@ + + + + + + +
+This serif font should NOT be used below. +
+
+
+These three lines should all use the same font face. +
+
+This line should NOT be bold. +
+
+This line should NOT be italic. +
+ + diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list index f79ee28dcd5..e6e483609b1 100644 --- a/layout/reftests/font-face/reftest.list +++ b/layout/reftests/font-face/reftest.list @@ -94,7 +94,10 @@ HTTP(..) == ex-unit-1-dynamic.html ex-unit-1-ref.html # random-if(!cocoaWidget) HTTP(..) == src-format-arabic.html src-format-arabic-aat-ref.html # random-if(cocoaWidget) HTTP(..) == src-format-arabic.html src-format-arabic-ot-ref.html +# bug 769194 - src:local() completely broken on android fails-if(Android) == local-1.html local-1-ref.html +fails-if(Android) == local-styled-1.html local-styled-1-ref.html + HTTP(..) == synthetic-weight-style.html synthetic-weight-style-ref.html HTTP(..) == synthetic-variations.html synthetic-variations-ref.html