Bug 517895: make column reftests more robust in the face of default font-metrics changes. r=roc
authorJonathan Kew <jfkthame@gmail.com>
Tue, 22 Sep 2009 00:11:10 +0100
changeset 33062 4a0dfd134a388d9860112328e26557fec3263024
parent 33061 adfe22e8923d07b078c32730adfc96a1593b4981
child 33063 440ef24cd6b337982481a9e5e90eab5997c07acb
push id9330
push userjkew@mozilla.com
push dateFri, 25 Sep 2009 19:58:56 +0000
treeherdermozilla-central@d88156be6c3f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs517895
milestone1.9.3a1pre
Bug 517895: make column reftests more robust in the face of default font-metrics changes. r=roc
layout/reftests/columns/column-balancing-004.html
layout/reftests/columns/columnrule-basic-ref.html
layout/reftests/columns/columnrule-basic.html
layout/reftests/columns/columnrule-complex-ref.html
layout/reftests/columns/columnrule-complex.html
layout/reftests/columns/columnrule-padding-ref.html
layout/reftests/columns/columnrule-padding.html
--- a/layout/reftests/columns/column-balancing-004.html
+++ b/layout/reftests/columns/column-balancing-004.html
@@ -3,17 +3,17 @@
 
 <style type="text/css">
   .colset {
     -moz-column-count: 3;
     -moz-column-gap: 0;
     border: solid silver;
     width: 9em;
   }
-  p { margin: 0; min-height: 1.5em; }
+  p { margin: 0; min-height: 2em; }
 </style>
 
 
 
 <div class="colset">
 <p>one</p>
 <p>two three</p>
 <p>four five</p>
--- a/layout/reftests/columns/columnrule-basic-ref.html
+++ b/layout/reftests/columns/columnrule-basic-ref.html
@@ -1,2 +1,15 @@
-<div style="position: absolute; top: 20px; left: 517px; width: 6px; background-color: red; height: 100px;"></div>
-<div style="position: absolute; top: 20px; left: 20px; -moz-column-count:2; -moz-column-gap: 0px;"><div style="height:200px; width: 500px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.</div></div>
+<div style="position: absolute;
+  top: 20px; left: 517px;
+  width: 6px;
+  background-color: red;
+  height: 100px;"></div>
+<div style="position: absolute;
+  top: 20px; left: 20px;
+  -moz-column-count:2;
+  -moz-column-gap: 0px;">
+<div style="height:200px;
+  width: 500px;
+  font-size: 16px;">
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
+</div>
+</div>
--- a/layout/reftests/columns/columnrule-basic.html
+++ b/layout/reftests/columns/columnrule-basic.html
@@ -1,1 +1,11 @@
-<div style="position: absolute; top: 20px; left: 20px; -moz-column-count:2; -moz-column-gap: 0px; -moz-column-rule: 6px red solid;"><div style="height:200px; width: 500px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.</div></div>
+<div style="position: absolute;
+  top: 20px; left: 20px;
+  -moz-column-count :2;
+  -moz-column-gap: 0px;
+  -moz-column-rule: 6px red solid;">
+<div style="height:200px;
+  width: 500px;
+  font-size: 16px;">
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
+</div>
+</div>
--- a/layout/reftests/columns/columnrule-complex-ref.html
+++ b/layout/reftests/columns/columnrule-complex-ref.html
@@ -1,4 +1,27 @@
-<div style="position: absolute; top: 20px; left: 317px; width: 6px; background-color: red; height: 50px;"></div>
-<div style="position: absolute; top: 20px; left: 617px; width: 6px; background-color: red; height: 50px;"></div>
-<div style="position: absolute; top: 20px; left: 917px; width: 6px; background-color: red; height: 50px;"></div>
-<div style="position: absolute; top: 20px; left: 20px; -moz-column-count:4; -moz-column-gap: 0px;"><div style="height:200px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.</div></div>
+<div style="position: absolute;
+  top: 20px; left: 317px;
+  width: 6px;
+  background-color: red; height: 100px;">
+</div>
+<div style="position: absolute;
+  top: 20px; left: 617px;
+  width: 6px;
+  background-color: red;
+  height: 100px;">
+</div>
+<div style="position: absolute;
+  top: 20px; left: 917px;
+  width: 6px;
+  background-color: red;
+  height: 100px;">
+</div>
+<div style="position: absolute;
+  top: 20px; left: 20px;
+  -moz-column-count: 4;
+  -moz-column-gap: 0px;">
+<div style="height:400px;
+  width: 300px;
+  font-size: 16px;">
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
+</div>
+</div>
--- a/layout/reftests/columns/columnrule-complex.html
+++ b/layout/reftests/columns/columnrule-complex.html
@@ -1,1 +1,11 @@
-<div style="position: absolute; top: 20px; left: 20px; -moz-column-count:4; -moz-column-gap: 0px; -moz-column-rule: 6px red solid;"><div style="height:200px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.</div></div>
+<div style="position: absolute;
+  top: 20px; left: 20px;
+  -moz-column-count: 4;
+  -moz-column-gap: 0px;
+  -moz-column-rule: 6px red solid;
+  font-size: 16px;">
+<div style="height:400px;
+  width: 300px;">
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
+</div>
+</div>
--- a/layout/reftests/columns/columnrule-padding-ref.html
+++ b/layout/reftests/columns/columnrule-padding-ref.html
@@ -1,4 +1,28 @@
-<div style="position: absolute; top: 40px; left: 337px; width: 6px; background-color: red; height: 50px;"></div>
-<div style="position: absolute; top: 40px; left: 637px; width: 6px; background-color: red; height: 50px;"></div>
-<div style="position: absolute; top: 40px; left: 937px; width: 6px; background-color: red; height: 50px;"></div>
-<div style="position: absolute; top: 40px; left: 40px; -moz-column-count:4; -moz-column-gap: 0px;"><div style="height:200px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.</div></div>
+<div style="position: absolute;
+  top: 40px; left: 337px;
+  width: 6px;
+  background-color: red;
+  height: 100px;">
+</div>
+<div style="position: absolute;
+  top: 40px; left: 637px;
+  width: 6px;
+  background-color: red;
+  height: 100px;">
+</div>
+<div style="position: absolute;
+  top: 40px; left: 937px;
+  width: 6px;
+  background-color: red;
+  height: 100px;">
+</div>
+<div style="position: absolute;
+  top: 40px; left: 40px;
+  -moz-column-count: 4;
+  -moz-column-gap: 0px;">
+<div style="height:400px;
+  width: 300px;
+  font-size: 16px;">
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
+</div>
+</div>
--- a/layout/reftests/columns/columnrule-padding.html
+++ b/layout/reftests/columns/columnrule-padding.html
@@ -1,1 +1,12 @@
-<div style="padding: 20px; position: absolute; top: 20px; left: 20px; -moz-column-count:4; -moz-column-gap: 0px; -moz-column-rule: 6px red solid;"><div style="height:200px; width: 300px;">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.</div></div>
+<div style="padding: 20px;
+  position: absolute;
+  top: 20px; left: 20px;
+  -moz-column-count: 4;
+  -moz-column-gap: 0px;
+  -moz-column-rule: 6px red solid;">
+<div style="height:400px;
+  width: 300px;
+  font-size: 16px;">
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa.
+</div>
+</div>