From 3c30b8af4df7c3470f7d0b296143e25202d9c773 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Tue, 25 Nov 2008 13:27:53 -0800 Subject: [PATCH] Make zwnj-02.html reftest more tolerant of font anti-aliasing. (Bug 465140) r=smontagu a=tests --HG-- rename : layout/reftests/text/zwnj-02-ref.html => layout/reftests/text/zwnj-01-notref.html rename : layout/reftests/text/zwnj-02-ref.html => layout/reftests/text/zwnj-02-ref.xhtml rename : layout/reftests/text/zwnj-02.html => layout/reftests/text/zwnj-02.xhtml --- layout/reftests/filters.svg | 36 +++++++++++++++++++ .../reftest-sanity/filter-1-ref.xhtml | 20 +++++++++++ layout/reftests/reftest-sanity/filter-1.xhtml | 32 +++++++++++++++++ .../reftest-sanity/filter-2-ref.xhtml | 16 +++++++++ layout/reftests/reftest-sanity/filter-2.xhtml | 32 +++++++++++++++++ layout/reftests/reftest-sanity/reftest.list | 3 ++ layout/reftests/text/reftest.list | 4 +-- .../{zwnj-02-ref.html => zwnj-01-notref.html} | 1 + layout/reftests/text/zwnj-02-ref.xhtml | 32 +++++++++++++++++ .../text/{zwnj-02.html => zwnj-02.xhtml} | 17 +++++++-- 10 files changed, 188 insertions(+), 5 deletions(-) create mode 100644 layout/reftests/filters.svg create mode 100644 layout/reftests/reftest-sanity/filter-1-ref.xhtml create mode 100644 layout/reftests/reftest-sanity/filter-1.xhtml create mode 100644 layout/reftests/reftest-sanity/filter-2-ref.xhtml create mode 100644 layout/reftests/reftest-sanity/filter-2.xhtml rename layout/reftests/text/{zwnj-02-ref.html => zwnj-01-notref.html} (98%) create mode 100644 layout/reftests/text/zwnj-02-ref.xhtml rename layout/reftests/text/{zwnj-02.html => zwnj-02.xhtml} (57%) diff --git a/layout/reftests/filters.svg b/layout/reftests/filters.svg new file mode 100644 index 00000000000..5f8b0aa56e9 --- /dev/null +++ b/layout/reftests/filters.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/layout/reftests/reftest-sanity/filter-1-ref.xhtml b/layout/reftests/reftest-sanity/filter-1-ref.xhtml new file mode 100644 index 00000000000..32f3a01b5bb --- /dev/null +++ b/layout/reftests/reftest-sanity/filter-1-ref.xhtml @@ -0,0 +1,20 @@ + + + Filter sanity-check + + + + +
+ +
+ +
+ +
+ + + diff --git a/layout/reftests/reftest-sanity/filter-1.xhtml b/layout/reftests/reftest-sanity/filter-1.xhtml new file mode 100644 index 00000000000..a5c81506d51 --- /dev/null +++ b/layout/reftests/reftest-sanity/filter-1.xhtml @@ -0,0 +1,32 @@ + + + + + + + + + + Filter sanity-check + + + + +
+ +
+ +
+ +
+ + + + + diff --git a/layout/reftests/reftest-sanity/filter-2-ref.xhtml b/layout/reftests/reftest-sanity/filter-2-ref.xhtml new file mode 100644 index 00000000000..c2514ba3800 --- /dev/null +++ b/layout/reftests/reftest-sanity/filter-2-ref.xhtml @@ -0,0 +1,16 @@ + + + Filter sanity-check + + + + +
+ +
+ + + diff --git a/layout/reftests/reftest-sanity/filter-2.xhtml b/layout/reftests/reftest-sanity/filter-2.xhtml new file mode 100644 index 00000000000..8999304805b --- /dev/null +++ b/layout/reftests/reftest-sanity/filter-2.xhtml @@ -0,0 +1,32 @@ + + + + + + + + + + Filter sanity-check + + + + +
+ +
+ +
+ +
+ + + + + diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list index cff652df07f..cc98a50ce03 100644 --- a/layout/reftests/reftest-sanity/reftest.list +++ b/layout/reftests/reftest-sanity/reftest.list @@ -32,3 +32,6 @@ HTTP == default.html data:text/html,
Text
HTTP == data:text/html,
Text
default.html != blank.html default.html HTTP != blank.html default.html + +HTTP(..) == filter-1.xhtml filter-1-ref.xhtml +HTTP(..) == filter-2.xhtml filter-2-ref.xhtml diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list index d09ee914c9c..eb81f48872f 100644 --- a/layout/reftests/text/reftest.list +++ b/layout/reftests/text/reftest.list @@ -25,8 +25,8 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == wordwrap-03.html wordwrap-03-ref.html # != wordwrap-09.html wordwrap-01-ref.html == wordwrap-09.html wordwrap-09-ref.html == zwnj-01.html zwnj-01-ref.html -== zwnj-02.html zwnj-02-ref.html -random-if(MOZ_WIDGET_TOOLKIT=="gtk2") != zwnj-01.html zwnj-02-ref.html # Bad fonts on the tinderbox -- works locally +HTTP(..) == zwnj-02.xhtml zwnj-02-ref.xhtml # HTTP(..) for ../filters.svg +random-if(MOZ_WIDGET_TOOLKIT=="gtk2") != zwnj-01.html zwnj-01-notref.html # Bad fonts on the tinderbox -- works locally fails-if(MOZ_WIDGET_TOOLKIT=="windows") == cgj-01.html cgj-01-ref.html # bug 455455 == 444656.html 444656-ref.html == 449555-1.html 449555-1-ref.html diff --git a/layout/reftests/text/zwnj-02-ref.html b/layout/reftests/text/zwnj-01-notref.html similarity index 98% rename from layout/reftests/text/zwnj-02-ref.html rename to layout/reftests/text/zwnj-01-notref.html index f2518233344..20a642b6248 100644 --- a/layout/reftests/text/zwnj-02-ref.html +++ b/layout/reftests/text/zwnj-01-notref.html @@ -1,6 +1,7 @@ + ZWNJ test diff --git a/layout/reftests/text/zwnj-02-ref.xhtml b/layout/reftests/text/zwnj-02-ref.xhtml new file mode 100644 index 00000000000..bc0b4345903 --- /dev/null +++ b/layout/reftests/text/zwnj-02-ref.xhtml @@ -0,0 +1,32 @@ + + + + + + + + + + + ZWNJ test + + + +

هفتهها

+

موزهها

+

سهشنبه

+

راهآهن

+

نرمافزار

+ + + + diff --git a/layout/reftests/text/zwnj-02.html b/layout/reftests/text/zwnj-02.xhtml similarity index 57% rename from layout/reftests/text/zwnj-02.html rename to layout/reftests/text/zwnj-02.xhtml index 3b0f6bbb345..7a1b37633a8 100644 --- a/layout/reftests/text/zwnj-02.html +++ b/layout/reftests/text/zwnj-02.xhtml @@ -1,12 +1,21 @@ - + + + + + + + + - ZWNJ test -