bug 703100 - pt 7 - fix fragile reftests that depend on metrics of fallback fonts used for invisible chars. r=roc
authorJonathan Kew <jfkthame@gmail.com>
Thu, 05 Jan 2012 11:54:46 +0000
changeset 86324 c0b62edd29173fff8fa7f23cf45e0dbe78321614
parent 86323 7b612dae71ec81d28e265f4414d43e80242077f5
child 86325 faf5f8842fecfdb4fbee3fb112e90baf56bfb27c
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs703100
milestone12.0a1
bug 703100 - pt 7 - fix fragile reftests that depend on metrics of fallback fonts used for invisible chars. r=roc
layout/reftests/bugs/619511-1-ref.html
layout/reftests/bugs/619511-1.html
layout/reftests/text/justification-1-ref.html
layout/reftests/text/justification-1.html
--- a/layout/reftests/bugs/619511-1-ref.html
+++ b/layout/reftests/bugs/619511-1-ref.html
@@ -3,16 +3,17 @@
 <style type="text/css">
 @font-face {
   font-family: dl1;
   src: url(../fonts/DeLarge/DeLarge.woff);
 }
 body {
   font-family: dl1, serif;
   font-size: 36px;
+  line-height: 2em;
   letter-spacing: 3px;
 }
 </style>
 </head>
 <body>
 <p>foobar</p>
 </body>
 </html>
--- a/layout/reftests/bugs/619511-1.html
+++ b/layout/reftests/bugs/619511-1.html
@@ -3,16 +3,17 @@
 <style type="text/css">
 @font-face {
   font-family: dl1;
   src: url(../fonts/DeLarge/DeLarge.woff);
 }
 body {
   font-family: dl1, serif;
   font-size: 36px;
+  line-height: 2em;
   letter-spacing: 3px;
 }
 </style>
 </head>
 <body>
 <p>foo&zwj;bar</p>
 </body>
 </html>
--- a/layout/reftests/text/justification-1-ref.html
+++ b/layout/reftests/text/justification-1-ref.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
 <html>
-<body style="width:6em; text-align:justify; border:1px solid black; overflow:hidden;">
+<body style="line-height:1.5em; width:6em; text-align:justify; border:1px solid black; overflow:hidden;">
 
-<p>I am the very model of a modern major-general.
-<p style="width:100em;">I am the very model of a modern major-general.
-<p style="width:100em;">I &nbsp;am the<br>very model of a modern major-general.
-<p style="text-align:left;">I&nbsp;&nbsp;&#x200b;am&nbsp;&#x200b;the<br>very&nbsp;&#x200b;model&nbsp;&#x200b;of&nbsp;&#x200b;a&nbsp;&#x200b;modern&nbsp;&#x200b;major-general.
-<p>I am the<br>very model of a modern major-general.
-
+<p>I am the very model of a modern major-general.</p>
+<p style="width:100em;">I am the very model of a modern major-general.</p>
+<p style="width:100em;">I &nbsp;am the<br>very model of a modern major-general.</p>
+<p style="text-align:left;">I&nbsp;&nbsp;&#x200b;am&nbsp;&#x200b;the<br>very&nbsp;&#x200b;model&nbsp;&#x200b;of&nbsp;&#x200b;a&nbsp;&#x200b;modern&nbsp;&#x200b;major-general.</p>
+<p>I am the<br>very model of a modern major-general.</p>
 </body>
 </html>
--- a/layout/reftests/text/justification-1.html
+++ b/layout/reftests/text/justification-1.html
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML>
 <html>
-<body style="width:6em; text-align:justify; border:1px solid black;">
+<body style="line-height:1.5em; width:6em; text-align:justify; border:1px solid black;">
 
 <!-- Test which white-space values are allowed to take justification -->
 
 <p style="white-space:normal;">I  am the
-very model of a modern major-general.
+very model of a modern major-general.</p>
 <p style="white-space:nowrap;">I  am the
-very model of a modern major-general.
+very model of a modern major-general.</p>
 <p style="white-space:pre;">I  am the
-very model of a modern major-general.
+very model of a modern major-general.</p>
 <p style="white-space:pre-wrap;">I  am the
-very model of a modern major-general.
+very model of a modern major-general.</p>
 <p style="white-space:pre-line;">I  am the
-very model of a modern major-general.
-</body></html>
\ No newline at end of file
+very model of a modern major-general.</p>
+</body></html>