Bug 665597 - Fix some reftests assumptions about margins and scrollable overflow. part=5/5 r=dbaron,roc

This commit is contained in:
Mats Palmgren 2012-01-17 00:38:10 +01:00
parent 554bbb0b27
commit bea763f11f
19 changed files with 51 additions and 40 deletions

View File

@ -42,7 +42,7 @@ load 265736-2.html
asserts(2) load 265899-1.html # bug 575011
load 265973-1.html
asserts(6-12) load 265986-1.html # Bug 512405
asserts(2-4) load 265999-1.html # bug 575011
asserts(2-6) load 265999-1.html # bug 575011
load 266222-1.html
asserts(3-7) load 266360-1.html # bug 575011 / bug 576358
asserts(4) load 266445-1.html # Bug 575011

View File

@ -3,7 +3,7 @@ load 25888-2.html
load 37757-1.html
load 225868-1.html
load 264937-1.html
asserts(9) load 265867-1.html # Bug 575011
asserts(13) load 265867-1.html # Bug 575011
load 265867-2.html
load 289864-1.html
load 295292-1.html
@ -14,7 +14,7 @@ load 310556-1.xhtml
load 322780-1.xul
load 323381-1.html
load 323381-2.html
asserts(2) asserts-if(gtk2Widget,8) load 323386-1.html # Bug 575011
asserts(2) asserts-if(gtk2Widget,25) load 323386-1.html # Bug 575011
load 323389-1.html
load 323389-2.html
load 323493-1.html
@ -217,7 +217,7 @@ load 431260-2.html
load 435529.html
load 436194-1.html
load 436602-1.html
load 436822-1.html
asserts(1-2) load 436822-1.html
load 436823.html
load 436969-1.html
load 437156-1.html
@ -259,8 +259,8 @@ load 465651-1.html
load 467137-1.html
load 467213-1.html
load 467487-1.html
load 467493-1.html
load 467493-2.html
asserts(11-12) load 467493-1.html
asserts(10-11) load 467493-2.html
load 467875-1.xhtml
load 467914-1.html
load 468207-1.html
@ -278,7 +278,7 @@ load 476241-1.html
load 477731-1.html
load 477928.html
load 478131-1.html
load 478170-1.html
asserts(4) load 478170-1.html
load 478185-1.html
asserts-if(!Android,1) load 479938-1.html # Bug 575011
load 480345-1.html
@ -309,7 +309,7 @@ load 512749-1.html
load 513394-1.html
load 514098-1.xhtml
load 514800-1.html
load 515811-1.html
asserts(1) load 515811-1.html
load 517968.html
load 519031.xhtml
load 520340.html
@ -321,8 +321,8 @@ load 534366-2.html
load 536692-1.xhtml
load 541277-1.html
load 541277-2.html
load 541714-1.html
load 541714-2.html
asserts(4) load 541714-1.html
asserts(5-6) load 541714-2.html
load 542136-1.html
load 545571-1.html
load 547338.xul
@ -332,7 +332,7 @@ asserts(5) load 553504-1.xhtml # nscoord_MAX assertions (bug 575011)
load 564368-1.xhtml
load 564968.xhtml
load 570160.html
load 570289-1.html
asserts(2) load 570289-1.html
load 571618-1.svg
asserts(1) load 571975-1.html # bug 574889
load 574958.xhtml
@ -372,7 +372,7 @@ load text-overflow-form-elements.html
load text-overflow-iframe.html
load text-overflow-bug666751-1.html
load text-overflow-bug666751-2.html
asserts(2) load text-overflow-bug670564.xhtml # asserts(2) for bug 436470
asserts(0-1) load text-overflow-bug670564.xhtml
load text-overflow-bug671796.xhtml
load 667025.html
asserts-if(Android,8) load 673770.html

View File

@ -5,7 +5,7 @@
<style type="text/css">
html, body { margin: 0; padding: 0; border: none; }
div { height: 1px; background: navy; }
div { height: 1px; background: navy; margin-right: 19px; }
</style>
</head>

View File

@ -6,7 +6,7 @@
html, body { margin: 0; padding: 0; border: none; }
div { height: 1px; background: blue;
border-left: 7px solid navy; border-right: 17px solid navy; }
border-left: 7px solid navy; border-right: 17px solid navy; margin-right: 19px; }
</style>
</head>

View File

@ -9,7 +9,7 @@ td {
table {
border: 1px solid black;
background-color: red;
width: 500px;
width: 200px;
border-spacing: 0;
}
</style>

View File

@ -9,7 +9,7 @@ td {
table {
border: 1px solid black;
background-color: red;
width: 500px;
width: 200px;
border-spacing: 0;
}
</style>

View File

@ -3,7 +3,7 @@
<body>
<div style="overflow:auto; width:300px; height:300px; background:green;">
<div style="height:100px;"></div>
<div style="height:200px; margin-left:100px; width:100px; background:yellow;"></div>
<div style="height:200px; margin-left:100px; margin-right:100px; width:100px; background:yellow;"></div>
<div style="height:100px;"></div>
</div>
</body>

View File

@ -0,0 +1,9 @@
<!DOCTYPE HTML>
<html>
<body>
<div style="overflow:auto; width:300px; height:300px; background:green;">
<div style="height:100px;"></div>
<div style="height:200px; margin-left:100px; margin-right:100px; width:100px; background:yellow;"></div>
</div>
</body>
</html>

View File

@ -3,7 +3,7 @@
<body>
<div style="overflow:auto; width:300px; height:300px; background:green;">
<div style="height:100px; margin-top:100px;">
<div style="height:200px; margin-left:100px; width:100px; margin-bottom:100px; background:yellow;"></div>
<div style="height:200px; margin-left:100px; width:100px; margin-bottom:100px; margin-right:100px; background:yellow;"></div>
</div>
</div>
</body>

View File

@ -2,7 +2,7 @@
<html>
<body>
<div style="overflow:auto; width:300px; height:300px; background:green;">
<div style="height:200px; margin-left:100px; width:100px; margin-top:100px; float:left; margin-bottom:100px; background:yellow;"></div>
<div style="height:200px; margin:100px; width:100px; float:left; background:yellow;"></div>
</div>
</body>
</html>

View File

@ -13,7 +13,7 @@
background: aqua;
}
#gap {
height: 42px;
height: 35px;
}
</style>

View File

@ -1196,7 +1196,7 @@ fails-if(cocoaWidget) == 456147.xul 456147-ref.html # bug 458047
== 456484-1.html 456484-1-ref.html
== 457398-1.html 457398-1-ref.html
== 457398-2.html 457398-2-ref.html
== 458296-1a.html 458296-1-ref.html
== 458296-1a.html 458296-1a-ref.html
== 458296-1b.html 458296-1-ref.html
== 458296-1c.html 458296-1-ref.html
== 458296-1d.html 458296-1-ref.html
@ -1567,7 +1567,7 @@ fails-if(Android) random-if(layersGPUAccelerated) fails-if(/^Windows\x20NT\x205\
== 582037-1b.html 582037-1-ref.html
== 582037-2a.html 582037-2-ref.html
== 582037-2b.html 582037-2-ref.html
asserts(0-1) == 582146-1.html about:blank
asserts(0-11) == 582146-1.html about:blank
== 582476-1.svg 582476-1-ref.svg
== 584400-dash-length.svg 584400-dash-length-ref.svg
== 584699-1.html 584699-1-ref.html

View File

@ -17,9 +17,9 @@
body > div:nth-child(10) > .progress-bar { }
body > div:nth-child(11) > .progress-bar { }
/* 12 - 15 should have 100% width, no need to specify. */
body > div:nth-child(16) > .progress-bar { position: relative; top: 64px; left: 64px;
height: -moz-calc(100% - 32px);
width: -moz-calc(100% + 128px - 1em); }
body > div:nth-of-type(16) > .progress-bar { position: relative; top: 64px; left: 64px;
height: -moz-calc(100% - 32px);
width: -moz-calc(100% + 128px - 1em); }
</style>
<body>
<div class="progress-element vertical">
@ -82,7 +82,7 @@
<div class="progress-bar">
</div>
</div>
<div class="progress-element vertical">
<br><div class="progress-element vertical">
<div class="progress-bar">
</div>
</div>

View File

@ -17,10 +17,10 @@
body > div:nth-child(10) > .progress-bar { }
body > div:nth-child(11) > .progress-bar { }
/* 12 - 15 should have 100% width, no need to specify. */
body > div:nth-child(16) > .progress-bar { position: relative; top: 64px;
left: -moz-calc(100% + 128px + 32px );
height: -moz-calc(100% - 32px);
width: -moz-calc(100% + 128px - 1em); }
body > div:nth-of-type(16) > .progress-bar { position: relative; top: 64px;
left: -moz-calc(100% + 128px + 32px );
height: -moz-calc(100% - 32px);
width: -moz-calc(100% + 128px - 1em); }
</style>
<body dir='rtl'>
<div class="progress-element vertical">
@ -83,7 +83,7 @@
<div class="progress-bar">
</div>
</div>
<div class="progress-element vertical">
<br><div class="progress-element vertical">
<div class="progress-bar">
</div>
</div>

View File

@ -21,7 +21,7 @@
body > progress:nth-child(13)::-moz-progress-bar { height: 10px; }
body > progress:nth-child(14)::-moz-progress-bar { height: 10%; }
body > progress:nth-child(15)::-moz-progress-bar { height: 200%; }
body > progress:nth-child(16)::-moz-progress-bar { margin: 64px; padding: 64px; }
body > progress:nth-of-type(16)::-moz-progress-bar { margin: 64px; padding: 64px; }
</style>
<body dir='rtl'>
<!-- Those will be used to change padding/margin on ::-moz-progress-bar -->
@ -41,6 +41,6 @@
<progress value='1'></progress>
<progress value='1'></progress>
<progress value='1'></progress>
<progress value='1'></progress>
<br><progress value='1'></progress>
</body>
</html>

View File

@ -21,7 +21,7 @@
body > progress:nth-child(13)::-moz-progress-bar { height: 10px; }
body > progress:nth-child(14)::-moz-progress-bar { height: 10%; }
body > progress:nth-child(15)::-moz-progress-bar { height: 200%; }
body > progress:nth-child(16)::-moz-progress-bar { margin: 64px; padding: 64px; }
body > progress:nth-of-type(16)::-moz-progress-bar { margin: 64px; padding: 64px; }
</style>
<body>
<!-- Those will be used to change padding/margin on ::-moz-progress-bar -->
@ -41,6 +41,6 @@
<progress value='1'></progress>
<progress value='1'></progress>
<progress value='1'></progress>
<progress value='1'></progress>
<br><progress value='1'></progress>
</body>
</html>

View File

@ -7,15 +7,16 @@
background-color: green;
}
#b {
height: 120px;
height: 160px;
margin-top: 20px;
margin-bottom: 20px;
padding: 40px 0;
padding-top: 40px;
background-color: green;
overflow-y: scroll;
}
#c {
height: 160px;
margin-bottom: 40px;
background-color: blue;
}
</style>

View File

@ -7,15 +7,16 @@
background-color: green;
}
#b {
height: 120px;
height: 160px;
margin-top: 20px;
margin-bottom: 20px;
padding: 40px 0;
padding-top: 40px;
background-color: green;
overflow: auto;
}
#c {
height: 160px;
margin-bottom: 40px;
background-color: blue;
}
</style>

View File

@ -80,7 +80,7 @@ function test()
<select id="f" style="width: 100px; height: 100px;"><option>a</option><option>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</option><option>a</option>\
<option>a</option><option>a</option><option>a</option><option>a</option><option>a</option><option>a</option><option>a</option>\
<option>a</option><option>a</option><option>a</option><option>a</option><option>a</option><option>a</option><option>a</option></select>\
<div id="g" style="width: 99px; height: 99px; padding: 10px; border: 10px solid black; margin: 10px; overflow: auto;"><div style="width: 100px; height: 100px;"></div></div>\
<div id="g" style="width: 99px; height: 99px; padding: 10px; border: 10px solid black; margin: 10px; overflow: auto;"><div style="width: 100px; height: 100px; margin: 10px;"></div></div>\
<div id="h" style="width: 100px; height: 100px; overflow: -moz-hidden-unscrollable;"><div style="width: 200px; height: 200px;"></div></div>\
<iframe id="iframe" style="display: none;"></iframe>\
</body>';