merge

leto · Nov 14, 2008 · e3ca2da · e3ca2da
2 parents eb4d061 + 6eb576e
commit e3ca2da
Show file tree

Hide file tree

Showing 19 changed files with 217 additions and 27 deletions.
diff --git a/layout/reftests/font-face/multiple-in-family-1-notref.html b/layout/reftests/font-face/multiple-in-family-1-notref.html
@@ -18,6 +18,9 @@
 <body>
 
 <p>ABC</p>
+<p>A</p>
+<p>B</p>
+<p>C</p>
 
 </body>
 </html>
diff --git a/layout/reftests/font-face/multiple-in-family-1-ref.html b/layout/reftests/font-face/multiple-in-family-1-ref.html
@@ -16,11 +16,19 @@
 		src: url(../fonts/markB.ttf);
 	}
 
+	@font-face {
+		font-family: "MarkD";
+		src: url(../fonts/markD.ttf);
+	}
+
 	</style>
 </head>
 <body>
 
-<p><span style="font-family: MarkA">A</span><span style="font-family: MarkB">B</span>C</p>
+<p style="font-family: MarkD">DDC</p>
+<p style="font-family: MarkA">A</p>
+<p style="font-family: MarkB">B</p>
+<p style="font-family: MarkA">C</p>
 
 </body>
 </html>
diff --git a/layout/reftests/font-face/multiple-in-family-1.html b/layout/reftests/font-face/multiple-in-family-1.html
@@ -23,6 +23,9 @@
 <body>
 
 <p>ABC</p>
+<p>A</p>
+<p>B</p>
+<p>C</p>
 
 </body>
 </html>
diff --git a/...ut/reftests/font-face/src-list-3-ref.html → layout/reftests/font-face/order-1-ref.html b/...ut/reftests/font-face/src-list-3-ref.html → layout/reftests/font-face/order-1-ref.html
@@ -11,16 +11,13 @@
 		src: url(../fonts/markA.ttf);
 	}
 
-	@font-face {
-		font-family: "Mark2B";
-		src: url(../fonts/mark2B.ttf);
-	}
+	body { font-family: "MarkA"; }
 
 	</style>
 </head>
 <body>
 
-<p><span style="font-family: MarkA">A</span><span style="font-family: Mark2B">B</span>C</p>
+<p>ABC</p>
 
 </body>
 </html>
diff --git a/layout/reftests/font-face/order-2-ref.html b/layout/reftests/font-face/order-2-ref.html
@@ -0,0 +1,23 @@
+<!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">
+
+	@font-face {
+		font-family: "MarkXMark2Y";
+		src: url(../fonts/markXmark2Y.ttf);
+	}
+
+	body { font-family: "MarkXMark2Y"; }
+
+	</style>
+</head>
+<body>
+
+<p>XYC</p>
+
+</body>
+</html>
diff --git a/layout/reftests/font-face/order-3-ref.html b/layout/reftests/font-face/order-3-ref.html
@@ -0,0 +1,23 @@
+<!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">
+
+	@font-face {
+		font-family: "MarkXMark2Y";
+		src: url(../fonts/markXmark2Y.ttf);
+	}
+
+	body { font-family: "MarkXMark2Y"; }
+
+	</style>
+</head>
+<body>
+
+<p>XYC</p>
+
+</body>
+</html>
diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list
@@ -11,15 +11,17 @@ fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) != name-override-simple-1.html dow
 fails HTTP(..) == name-override-1.html name-override-1-ref.html
 HTTP(..) == multiple-descriptor-1.html multiple-descriptor-1-ref.html
 fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) != multiple-descriptor-1.html multiple-descriptor-1-notref.html
-HTTP(..) == src-list-1.html src-list-1-ref.html
-fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") HTTP(..) == src-list-2.html src-list-2-ref.html
-fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") HTTP(..) == src-list-3.html src-list-3-ref.html
+fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == src-list-1.html src-list-1-ref.html
+fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == src-list-2.html src-list-2-ref.html
+fails HTTP(..) == src-list-format-1.html src-list-format-1-ref.html
+fails HTTP(..) == src-list-format-2.html src-list-format-2-ref.html
+fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == src-list-format-3.html src-list-format-3-ref.html
 # FIXME: The behavior here is neither mandated nor specified by the spec, but
 # it really ought to be.
-HTTP(..) == order-1.html src-list-1-ref.html
-fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") HTTP(..) == order-2.html src-list-2-ref.html
-fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") HTTP(..) == order-3.html src-list-3-ref.html
-fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == multiple-in-family-1.html multiple-in-family-1-ref.html
+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-1.html multiple-in-family-1-notref.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

diff --git a/layout/reftests/font-face/src-list-1-ref.html b/layout/reftests/font-face/src-list-1-ref.html
@@ -7,17 +7,17 @@
 	<style type="text/css">
 
 	@font-face {
-		font-family: "MarkA";
-		src: url(../fonts/markA.ttf);
+		font-family: "MarkD";
+		src: url(../fonts/markD.ttf);
 	}
 
-	body { font-family: "MarkA"; }
+	body { font-family: "MarkD"; }
 
 	</style>
 </head>
 <body>
 
-<p>ABC</p>
+<p>DBC</p>
 
 </body>
 </html>
diff --git a/layout/reftests/font-face/src-list-2-ref.html b/layout/reftests/font-face/src-list-2-ref.html
@@ -7,20 +7,17 @@
 	<style type="text/css">
 
 	@font-face {
-		font-family: "MarkA";
-		src: url(../fonts/markA.ttf);
+		font-family: "MarkD";
+		src: url(../fonts/markD.ttf);
 	}
 
-	@font-face {
-		font-family: "Mark2B";
-		src: url(../fonts/mark2B.ttf);
-	}
+	body { font-family: MarkD; }
 
 	</style>
 </head>
 <body>
 
-<p><span style="font-family: MarkA">A</span><span style="font-family: Mark2B">B</span>C</p>
+<p>DBC</p>
 
 </body>
 </html>
diff --git a/layout/reftests/font-face/src-list-2.html b/layout/reftests/font-face/src-list-2.html
@@ -8,7 +8,7 @@
 
 	@font-face {
 		font-family: "One";
-		src: url(../fonts/markA.ttf), url(../fonts/mark2A.ttf), url(../fonts/mark2B.ttf), url(../fonts/markB.ttf);
+		src: url(../fonts/markA.ttf), url(../fonts/markB.ttf);
 	}
 
 	body { font-family: "One"; }

diff --git a/layout/reftests/font-face/src-list-format-1-ref.html b/layout/reftests/font-face/src-list-format-1-ref.html
@@ -0,0 +1,23 @@
+<!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">
+
+	@font-face {
+		font-family: "Mark2D";
+		src: url(../fonts/mark2D.ttf);
+	}
+
+	body { font-family: "Mark2D"; }
+
+	</style>
+</head>
+<body>
+
+<p>DBC</p>
+
+</body>
+</html>
diff --git a/layout/reftests/font-face/src-list-3.html → ...reftests/font-face/src-list-format-1.html b/layout/reftests/font-face/src-list-3.html → ...reftests/font-face/src-list-format-1.html
@@ -8,7 +8,7 @@
 
 	@font-face {
 		font-family: "One";
-		src: url(../fonts/markA.ttf), url(../fonts/mark2B.ttf), url(../fonts/mark2A.ttf), url(../fonts/markB.ttf);
+		src: url(../fonts/markA.ttf) format("unknown"), url(../fonts/mark2A.ttf);
 	}
 
 	body { font-family: "One"; }

diff --git a/layout/reftests/font-face/src-list-format-2-ref.html b/layout/reftests/font-face/src-list-format-2-ref.html
@@ -0,0 +1,23 @@
+<!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">
+
+	@font-face {
+		font-family: "Mark2D";
+		src: url(../fonts/mark2D.ttf);
+	}
+
+	body { font-family: "Mark2D"; }
+
+	</style>
+</head>
+<body>
+
+<p>DBC</p>
+
+</body>
+</html>
diff --git a/layout/reftests/font-face/src-list-format-2.html b/layout/reftests/font-face/src-list-format-2.html
@@ -0,0 +1,23 @@
+<!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">
+
+	@font-face {
+		font-family: "One";
+		src: url(../fonts/markA.ttf) format("unknown"), url(../fonts/mark2A.ttf) format("truetype");
+	}
+
+	body { font-family: "One"; }
+
+	</style>
+</head>
+<body>
+
+<p>ABC</p>
+
+</body>
+</html>
diff --git a/layout/reftests/font-face/src-list-format-3-ref.html b/layout/reftests/font-face/src-list-format-3-ref.html
@@ -0,0 +1,23 @@
+<!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">
+
+	@font-face {
+		font-family: "MarkD";
+		src: url(../fonts/markD.ttf);
+	}
+
+	body { font-family: MarkD; }
+
+	</style>
+</head>
+<body>
+
+<p>DBC</p>
+
+</body>
+</html>
diff --git a/layout/reftests/font-face/src-list-format-3.html b/layout/reftests/font-face/src-list-format-3.html
@@ -0,0 +1,23 @@
+<!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">
+
+	@font-face {
+		font-family: "One";
+		src: url(../fonts/markA.ttf) format("unknown", "truetype"), url(../fonts/mark2A.ttf) format("truetype");
+	}
+
+	body { font-family: "One"; }
+
+	</style>
+</head>
+<body>
+
+<p>ABC</p>
+
+</body>
+</html>
diff --git a/layout/reftests/fonts/mark-generate.py b/layout/reftests/fonts/mark-generate.py
@@ -66,3 +66,22 @@
         g.width = width
 
         f.generate("mark" + mark + charname + ".ttf")
+
+# And, for references, generate markXmark2Y
+f = fontforge.font()
+n = "MarkXMark2Y"
+f.fontname = n
+f.familyname = n
+f.fullname = n
+f.copyright = "Copyright (c) 2008 Mozilla Corporation"
+
+g = f.createChar(ord("X"), "X")
+g.importOutlines("mark-glyph.svg")
+g.width = 1500
+
+g = f.createChar(ord("Y"), "Y")
+g.importOutlines("mark2-glyph.svg")
+g.width = 1800
+
+f.generate("markXmark2Y.ttf")
+
diff --git a/layout/reftests/fonts/markXmark2Y.ttf b/layout/reftests/fonts/markXmark2Y.ttf
diff --git a/layout/tools/reftest/reftest-analyzer.xhtml b/layout/tools/reftest/reftest-analyzer.xhtml
@@ -293,7 +293,7 @@ function show_differences(cb) {
     <label><input type="radio" name="which" value="1" onchange="show_image(2)" />Image 2</label>
     <label><input type="checkbox" onchange="show_differences(this)" />Circle differences</label>
     </form>
-    <svg style="position: absolute; left: 300px; top: 50px;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800px" height="1000px" viewbox="0 0 800 1000" id="svg">
+    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800px" height="1000px" viewbox="0 0 800 1000" id="svg">
       <defs>
 	<filter id="showDifferences" x="0%" y="0%" width="100%" height="100%">
 	  <feImage id="feimage1" result="img1" xlink:href="#image1" />