Back out 48da1d4688225df4aaeb0c56744b7f150d65f5df due to mac startup failures.

This commit is contained in:
L. David Baron 2008-11-25 14:37:59 -08:00
parent 192d52dd0e
commit bcce3fc718
6 changed files with 15 additions and 49 deletions

View File

@ -1,33 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="en-US">
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
/* This has the @font-face rules in the other order, in case that matters */
@font-face {
font-family: "MarkB";
src: url(../fonts/markB.ttf);
}
@font-face {
font-family: "MarkA";
src: url(../fonts/markA.ttf);
}
body { font-family: "MarkA", "MarkB"; }
</style>
</head>
<body>
<p>ABC</p>
<p>A</p>
<p>B</p>
<p>C</p>
</body>
</html>

View File

@ -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"; }
</style>
</head>

View File

@ -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"; }
</style>
</head>

View File

@ -7,8 +7,8 @@
<style type="text/css">
@font-face {
font-family: "Mark2A";
src: url(../fonts/mark2A.ttf);
font-family: "MarkB";
src: url(../fonts/markB.ttf);
}
@font-face {
@ -16,7 +16,7 @@
src: url(../fonts/markA.ttf);
}
body { font-family: "MarkA", "Mark2A"; }
body { font-family: "MarkA", "MarkB"; }
</style>
</head>

View File

@ -7,8 +7,8 @@
<style type="text/css">
@font-face {
font-family: "Mark2A";
src: url(../fonts/mark2A.ttf);
font-family: "MarkB";
src: url(../fonts/markB.ttf);
}
@font-face {
@ -16,7 +16,7 @@
src: url(../fonts/markA.ttf);
}
body { font-family: "Mark2A", "MarkA"; }
body { font-family: "MarkB", "MarkA"; }
</style>
</head>

View File

@ -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