Bug 944200 part 5 - [css-ui] Reftests for 'text-overflow' with text overlapping floats.
MozReview-Commit-ID: BA7RgrPY11y
--- a/layout/reftests/text-overflow/false-marker-overlap-ref.html
+++ b/layout/reftests/text-overflow/false-marker-overlap-ref.html
@@ -26,16 +26,17 @@ html,body {
}
i {
display:inline-block;
height: 3em;
width: 3em;
border:1px solid blue;
text-shadow: none;
+ visibility: hidden;
}
.rtl {
direction:rtl;
}
.rlo {
unicode-bidi: bidi-override; direction: rtl;
}
.lro {
@@ -57,15 +58,15 @@ s {
.overlap {margin-left:-0.6em;}
.rtl .overlap {margin-right:-0.6em;margin-left:0;}
.n {padding-left:0.6em;}
.rtl .n {padding-right:0.6em;padding-left:0;}
</style>
</head><body>
-<div class="test"><font class="overlap"><s></s> <m>…</m>| | | | | | | | | | | | | | | | | | | | | | <i class="n"></i></font></div>
-<div class="test"><font><s></s>| | | | | | | | | | | | | | | | | | | | | | | <i></i></font></div>
-<div class="test rtl"><font class="overlap"><s></s> <m>…</m>| | | | | | | | | | | | | | | | | | | | | | <i class="n"></i></font></div>
-<div class="test rtl"><font><s></s>| | | | | | | | | | | | | | | | | | | | | | | <i></i></font></div>
+<div class="test"><font class="overlap"><s></s> <m>…</m>| | | | | | | | | | | | | | | | | | | | | | …<i class="n"></i></font></div>
+<div class="test"><font><s></s>| | | | | | | | | | | | | | | | | | | | | | | …<i></i></font></div>
+<div class="test rtl"><font class="overlap"><s></s> <m>…</m>| | | | | | | | | | | | | | | | | | | | | | …<i class="n"></i></font></div>
+<div class="test rtl"><font><s></s>| | | | | | | | | | | | | | | | | | | | | | | …<i></i></font></div>
</body></html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-overflow/float-edges-1-ref.html
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>Reference: Testcase for bug 944200</title>
+ <style type="text/css">
+html,body {
+ color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.container {
+ border: 1px solid black;
+ width: 150px;
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+.float {
+ float: right;
+ background: yellow;
+ width: 50px;
+ text-indent: 0;
+}
+.left { float: left; }
+.h { height: 3.5em; }
+ </style>
+</head>
+<body>
+
+<div style="float:left">
+<div class="container"><div class="float">FF</div>aaaaaaa…</div>
+<div class="container"><div class="float">FF</div>aaaaaaa…</div>
+<div class="container"><div class="float">FF</div>aaaaaaa…<br>aaaaaaaaaaa…</div>
+<div class="container"><div class="float">FF</div>aaaaaaa…<br>aaaaaaaaaa</div>
+
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div> …aa</div>
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div> …aa<br>aaaaaaaaaaa…</div>
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div> …aa<br>aaaaaaaaaa</div>
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div> …aa<br><span style="margin-left:-20px"> …aaaaaaa</span></div>
+</div>
+
+
+<div style="float:right">
+<div class="container">
+aaaaaaaaaa<br>
+aaaaaaaaaaa…<br><div class="float h">FF</div>
+aaaaaaa…<br>
+aaaaaaa<br>
+aaaaaaa…<br>
+aaaaaaa…<br>
+aaaaaaaaaa<br>
+aaaaaaaaaaa…<br>
+</div>
+
+<div class="container" style="text-indent:-20px">
+ …aaaaaaa<br>
+aaaaaaaaaaa…<br><div class="float left h">FF</div>
+<span style="margin-left:-20px"> …aaaaaa…</span><br>
+aaaaaaa…<br>
+aaaa<br>
+<span style="margin-left:-20px"> …aaaaaaa</span><br>
+aaaaaaaaaa<br>
+aaaaaaaaaaa…<br>
+</div>
+
+</div>
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/text-overflow/float-edges-1.html
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>Testcase for bug 944200</title>
+ <style type="text/css">
+html,body {
+ color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.container {
+ border: 1px solid black;
+ width: 150px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ text-overflow: ellipsis ellipsis;
+ white-space: nowrap;
+}
+
+.float {
+ float: right;
+ background: yellow;
+ width: 50px;
+ text-indent: 0;
+}
+.left { float: left; }
+.h { height: 3.5em; }
+ </style>
+</head>
+<body>
+
+<div style="float:left">
+<div class="container"><div class="float">FF</div>aaaaaaaaaaaaaaaaaaaaaa</div>
+<div class="container"><div class="float">FF</div>aaaaaaaaaa</div>
+<div class="container"><div class="float">FF</div>aaaaaaaaaaaaaaaaaaaaaa<br>aaaaaaaaaaaaaaaaaaaaaa</div>
+<div class="container"><div class="float">FF</div>aaaaaaaaaaaaaaaaaaaaaa<br>aaaaaaaaaa</div>
+
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div>aaaaa</div>
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div>aaaaa<br>aaaaaaaaaaaaaaaaaaaaaa</div>
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div>aaaaa<br>aaaaaaaaaa</div>
+<div class="container" style="text-indent:-20px"><div class="float left">FF</div>aaaaa<br><span style="margin-left:-20px">aaaaaaaaaa</span></div>
+</div>
+
+
+<div style="float:right">
+<div class="container">
+aaaaaaaaaa<br>
+aaaaaaaaaaaaaaaaaaaaaa<br><div class="float h">FF</div>
+aaaaaaaaaaaaaaaaaaaaaa<br>
+aaaaaaa<br>
+aaaaaaaaaa<br>
+aaaaaaaaaaaaaaaaaaaaaa<br>
+aaaaaaaaaa<br>
+aaaaaaaaaaaaaaaaaaaaaa<br>
+</div>
+
+<div class="container" style="text-indent:-20px">
+aaaaaaaaaa<br>
+aaaaaaaaaaaaaaaaaaaaaa<br><div class="float left h">FF</div>
+<span style="margin-left:-20px">aaaaaaaaaaaaaaaaaaaaaa</span><br>
+aaaaaaaaaaaaaaaaaaaaaa<br>
+aaaa<br>
+<span style="margin-left:-20px">aaaaaaaaaa</span><br>
+aaaaaaaaaa<br>
+aaaaaaaaaaaaaaaaaaaaaa<br>
+</div>
+
+</div>
+</body>
+</html>
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@@ -20,16 +20,17 @@ skip-if(Android) fuzzy-if(skiaContent,1,
HTTP(..) == theme-overflow.html theme-overflow-ref.html
HTTP(..) == table-cell.html table-cell-ref.html
fuzzy-if(gtkWidget,10,32) HTTP(..) == two-value-syntax.html two-value-syntax-ref.html
HTTP(..) == single-value.html single-value-ref.html
fuzzy-if(gtkWidget,10,2) HTTP(..) == atomic-under-marker.html atomic-under-marker-ref.html
fuzzy(1,2616) skip-if(Android) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,12352) fails-if(gtkWidget) HTTP(..) == xulscroll.html xulscroll-ref.html # gtkWidget:bug 1309107, bug 1328771
HTTP(..) == combobox-zoom.html combobox-zoom-ref.html
== dynamic-change-1.html dynamic-change-1-ref.html
+== float-edges-1-ref.html float-edges-1-ref.html
# The vertical-text pref setting can be removed after bug 1138384 lands
== vertical-decorations-1.html vertical-decorations-1-ref.html
== vertical-decorations-2.html vertical-decorations-2-ref.html
!= vertical-decorations-1.html vertical-decorations-1-2-notref.html
!= vertical-decorations-2.html vertical-decorations-1-2-notref.html
== vertical-decorations-3.html vertical-decorations-3-ref.html
== vertical-decorations-4.html vertical-decorations-4-ref.html