From bcce3fc718bcbf09494ea4171de21ea92eb794ec Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Tue, 25 Nov 2008 14:37:59 -0800 Subject: [PATCH] Back out 48da1d4688225df4aaeb0c56744b7f150d65f5df due to mac startup failures. --- .../font-face/multiple-in-family-1b.html | 33 ------------------- .../prop-order-over-rule-order-1a.html | 6 ++-- .../prop-order-over-rule-order-1b.html | 6 ++-- .../prop-order-over-rule-order-2a.html | 6 ++-- .../prop-order-over-rule-order-2b.html | 6 ++-- layout/reftests/font-face/reftest.list | 7 ++-- 6 files changed, 15 insertions(+), 49 deletions(-) delete mode 100644 layout/reftests/font-face/multiple-in-family-1b.html diff --git a/layout/reftests/font-face/multiple-in-family-1b.html b/layout/reftests/font-face/multiple-in-family-1b.html deleted file mode 100644 index 72dd13ebda61..000000000000 --- a/layout/reftests/font-face/multiple-in-family-1b.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - -

ABC

-

A

-

B

-

C

- - - diff --git a/layout/reftests/font-face/prop-order-over-rule-order-1a.html b/layout/reftests/font-face/prop-order-over-rule-order-1a.html index 9b92535e29e3..43aa47139a40 100644 --- a/layout/reftests/font-face/prop-order-over-rule-order-1a.html +++ b/layout/reftests/font-face/prop-order-over-rule-order-1a.html @@ -12,11 +12,11 @@ } @font-face { - font-family: "Mark2A"; - src: url(../fonts/mark2A.ttf); + font-family: "MarkB"; + src: url(../fonts/markB.ttf); } - body { font-family: "MarkA", "Mark2A"; } + body { font-family: "MarkA", "MarkB"; } diff --git a/layout/reftests/font-face/prop-order-over-rule-order-1b.html b/layout/reftests/font-face/prop-order-over-rule-order-1b.html index 2d3c8d34e700..503f64f82568 100644 --- a/layout/reftests/font-face/prop-order-over-rule-order-1b.html +++ b/layout/reftests/font-face/prop-order-over-rule-order-1b.html @@ -12,11 +12,11 @@ } @font-face { - font-family: "Mark2A"; - src: url(../fonts/mark2A.ttf); + font-family: "MarkB"; + src: url(../fonts/markB.ttf); } - body { font-family: "Mark2A", "MarkA"; } + body { font-family: "MarkB", "MarkA"; } diff --git a/layout/reftests/font-face/prop-order-over-rule-order-2a.html b/layout/reftests/font-face/prop-order-over-rule-order-2a.html index e2958447891c..09bda040d0b0 100644 --- a/layout/reftests/font-face/prop-order-over-rule-order-2a.html +++ b/layout/reftests/font-face/prop-order-over-rule-order-2a.html @@ -7,8 +7,8 @@ diff --git a/layout/reftests/font-face/prop-order-over-rule-order-2b.html b/layout/reftests/font-face/prop-order-over-rule-order-2b.html index 6e44aae59e53..ed714142c5aa 100644 --- a/layout/reftests/font-face/prop-order-over-rule-order-2b.html +++ b/layout/reftests/font-face/prop-order-over-rule-order-2b.html @@ -7,8 +7,8 @@ diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list index ebbaaccffed2..77d0b4336fbd 100644 --- a/layout/reftests/font-face/reftest.list +++ b/layout/reftests/font-face/reftest.list @@ -25,11 +25,10 @@ HTTP(..) == order-1.html order-1-ref.html fails HTTP(..) == order-2.html order-2-ref.html fails HTTP(..) == order-3.html order-3-ref.html fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == multiple-in-family-1.html multiple-in-family-1-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == multiple-in-family-1b.html multiple-in-family-1-ref.html fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) != multiple-in-family-1.html multiple-in-family-1-notref.html -HTTP(..) == prop-order-over-rule-order-1a.html prop-order-over-rule-order-2a.html -HTTP(..) == prop-order-over-rule-order-1b.html prop-order-over-rule-order-2b.html -fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) != prop-order-over-rule-order-1a.html prop-order-over-rule-order-1b.html +random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == prop-order-over-rule-order-1a.html prop-order-over-rule-order-2a.html +random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == prop-order-over-rule-order-1b.html prop-order-over-rule-order-2b.html +random-if(MOZ_WIDGET_TOOLKIT=="windows") fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) != prop-order-over-rule-order-1a.html prop-order-over-rule-order-1b.html fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == cross-iframe-1.html cross-iframe-1-ref.html # Dynamic changes