--- a/layout/reftests/bugs/411334-1-ref.xml
+++ b/layout/reftests/bugs/411334-1-ref.xml
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
-<div style="font-family: serif; font-size: 100px;">
+<div style="font-family: serif; font-size: 100px; padding-left:10px;">
W<img style="width:0px; height:200px;" src="mozilla-banner.gif"/>
</div>
</body>
</html>
--- a/layout/reftests/bugs/411334-1.xml
+++ b/layout/reftests/bugs/411334-1.xml
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
<svg xmlns="http://www.w3.org/2000/svg" style="font-family: serif; font-size: 100px;" height="500" width="500">
- <text x="0" y="200">W</text>
+ <text x="10" y="200">W</text>
</svg>
</body>
</html>
--- a/layout/reftests/bugs/413286-1a.html
+++ b/layout/reftests/bugs/413286-1a.html
@@ -1,14 +1,14 @@
<html>
<head>
<style>
table { width: 400px; height: 25px; }
- td.blue { background: lightblue; color: lightblue }
- td.green { background: lightgreen; color: lightgreen }
+ td.blue { background: lightblue; color: rgba(0,0,0,0) }
+ td.green { background: lightgreen; color: rgba(0,0,0,0) }
col.a { width: 100px; }
col.c { width: 25%; }
</style>
</head>
<body>
With colspan:
<table cellspacing=0 cellpadding=0>
<colgroup><col class="a"/><col/><col class="c"/></colgroup>
--- a/layout/reftests/bugs/413286-1b.html
+++ b/layout/reftests/bugs/413286-1b.html
@@ -1,14 +1,14 @@
<html>
<head>
<style>
table { width: 400px; height: 25px; }
- td.blue { background: lightblue; color: lightblue }
- td.green { background: lightgreen; color: lightgreen }
+ td.blue { background: lightblue; color: rgba(0,0,0,0) }
+ td.green { background: lightgreen; color: rgba(0,0,0,0) }
col.a { width: 25%; }
col.c { width: 25%; }
</style>
</head>
<body>
With colspan:
<table cellspacing=0 cellpadding=0>
<colgroup><col class="a"/><col/><col class="c"/></colgroup>
--- a/layout/reftests/bugs/413286-1c.html
+++ b/layout/reftests/bugs/413286-1c.html
@@ -1,14 +1,14 @@
<html>
<head>
<style>
table { width: 400px; height: 25px; }
- td.blue { background: lightblue; color: lightblue }
- td.green { background: lightgreen; color: lightgreen }
+ td.blue { background: lightblue; color: rgba(0,0,0,0) }
+ td.green { background: lightgreen; color: rgba(0,0,0,0) }
col.a { width: 100px; }
col.c { width: 100px; }
</style>
</head>
<body>
With colspan:
<table cellspacing=0 cellpadding=0>
<colgroup><col class="a"/><col/><col class="c"/></colgroup>
--- a/layout/reftests/bugs/427370-1-ref.html
+++ b/layout/reftests/bugs/427370-1-ref.html
@@ -38,72 +38,75 @@
.rtl {
direction:rtl;
}
.ltr {
direction:ltr;
}
+ .C {
+ padding:0 0.2em 0 0.2em;
+ }
</style>
</head>
<body>
<div style="position:absolute;top:0;left: 50px;bottom:0;width:1px;background:lime;opacity:0.5"></div>
<div style="position:absolute;top:0;right:50px;bottom:0;width:1px;background:lime;opacity:0.5"></div>
<div class="ltr">
<ol>
<li><div style="overflow:hidden;">
<label></label>
Outside
</div></li>
<li><div style="overflow:hidden;">
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</div></li>
</ol>
</div>
<div class="rtl">
<ol>
<li><div style="overflow:hidden;">
<label></label>
Outside
</div></li>
<li><div style="overflow:hidden;">
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</div></li>
</ol>
</div>
<br style="clear:both;">
<div style="float:left; width:100px; height:5em; border:1px solid black"></div>
<div class="ltr">
<ol>
<li><div style="overflow:hidden;">
<label></label>
Outside
</div></li>
<li><div style="overflow:hidden;">
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</div></li>
</ol>
</div>
<br style="clear:both;">
<div style="float:right; width:100px; height:5em; border:1px solid black"></div>
<div class="rtl">
<ol>
<li><div style="overflow:hidden;">
<label></label>
Outside
</div></li>
<li><div style="overflow:hidden;">
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</div></li>
</ol>
</div>
<br style="clear:both;">
<div class="ltr">
--- a/layout/reftests/bugs/427370-1.html
+++ b/layout/reftests/bugs/427370-1.html
@@ -38,72 +38,75 @@
.rtl {
direction:rtl;
}
.ltr {
direction:ltr;
}
+ .C {
+ padding:0 0.2em 0 0.2em;
+ }
</style>
</head>
<body>
<div style="position:absolute;top:0;left: 50px;bottom:0;width:1px;background:lime;opacity:0.5"></div>
<div style="position:absolute;top:0;right:50px;bottom:0;width:1px;background:lime;opacity:0.5"></div>
<div class="ltr">
<ol>
<li>
<label></label>
Outside
</li>
<li>
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</li>
</ol>
</div>
<div class="rtl">
<ol>
<li>
<label></label>
Outside
</li>
<li>
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</li>
</ol>
</div>
<br style="clear:both;">
<div style="float:left; width:100px; height:5em; border:1px solid black"></div>
<div class="ltr">
<ol>
<li>
<label></label>
Outside
</li>
<li>
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</li>
</ol>
</div>
<br style="clear:both;">
<div style="float:right; width:100px; height:5em; border:1px solid black"></div>
<div class="rtl">
<ol>
<li>
<label></label>
Outside
</li>
<li>
- <div></div><div>C</div>
+ <div></div><div><span class="C">C</span></div>
</li>
</ol>
</div>
<br style="clear:both;">
<div class="ltr">
--- a/layout/reftests/bugs/430813-3-ref.html
+++ b/layout/reftests/bugs/430813-3-ref.html
@@ -3,12 +3,12 @@
<head>
<title>Testcase, bug 430813</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
<body>
<div style="margin-bottom: 1px">text</div>
<div style="float:left;width:90px;height:300px"></div>
<div style="margin-left:90px">
-This text should be near the top of the page, not pushed below the float.
+<span style="padding:0.2em;">This text should be near the top of the page, not pushed below the float.</span>
</div>
</body>
</html>
--- a/layout/reftests/bugs/430813-3.html
+++ b/layout/reftests/bugs/430813-3.html
@@ -3,12 +3,12 @@
<head>
<title>Testcase, bug 430813</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
<body>
<div style="margin-bottom: 1px">text</div>
<div style="float:left;width:90px;height:300px"></div>
<div style="overflow:hidden">
-This text should be near the top of the page, not pushed below the float.
+<span style="padding:0.2em;">This text should be near the top of the page, not pushed below the float.</span>
</div>
</body>
</html>
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -6011,17 +6011,17 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex
# Protect against Makefile macro expansion.
cat > conftest.defs <<\EOF
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
s%\[%\\&%g
s%\]%\\&%g
s%\$%$$%g
EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '`
rm -f conftest.defs
# Without the "./", some shells look in PATH for config.status.
: ${CONFIG_STATUS=./config.status}
echo creating $CONFIG_STATUS
rm -f $CONFIG_STATUS