Bug 661471. Part 5: Fix reftests. r=roc

This commit is contained in:
Jonathan Kew 2011-06-03 16:31:08 +12:00
parent 5b709e2873
commit 69863cb1b2
29 changed files with 72 additions and 10 deletions

View File

@ -43,6 +43,6 @@ load 538062-1.xhtml
load 570624-1.html
load 498698-1.html
asserts(1) load 578604-1.html # bug 584564
asserts(5) load 590302-1.xhtml # bug 584564
asserts(3-5) load 590302-1.xhtml # bug 584564
load 626014.xhtml
load 639733.xhtml

View File

@ -675,7 +675,7 @@ fails-if(Android) != 376532-3.html 376532-3-ref.html
== 379178-html.html 379178-html-ref.html
== 379178-svg.svg 379178-svg-ref.svg
== 379316-1.html 379316-1-ref.html
fails-if(Android) random-if(cocoaWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 379316-2.html 379316-2-ref.html # bug 379786
fails-if(Android) random-if(cocoaWidget) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 379316-2.html 379316-2-ref.html # bug 379786
== 379328-1.html 379328-1-ref.html
== 379349-1a.xhtml 379349-1-ref.xhtml
== 379349-1b.xhtml 379349-1-ref.xhtml
@ -1538,7 +1538,8 @@ needs-focus == 568441.html 568441-ref.html
# 574907 is a windows-only issue, result on other platforms depends on details of font support
random-if(!winWidget) == 574907-1.html 574907-1-ref.html
random-if(!winWidget) == 574907-2.html 574907-2-ref.html
random-if(!winWidget) fails-if(winWidget&&!d2d) != 574907-3.html 574907-3-notref.html
# 574907-3 only worked under directwrite, and even there it now depends on the rendering mode; marking as random for now
random-if(!winWidget) fails-if(winWidget&&!d2d) random-if(winWidget&&d2d) != 574907-3.html 574907-3-notref.html
== 577838-1.html 577838-1-ref.html
== 577838-2.html 577838-2-ref.html
fails-if(Android) random-if(layersGPUAccelerated) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fails-if(/Mac\x20OS\x20X\x2010\.5/.test(http.oscpu)) == 579323-1.html 579323-1-ref.html # bug 623450 for WinXP and bug 627560 for OSX 10.5

View File

@ -2,6 +2,9 @@
<html class="reftest-wait">
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#ib1 {
display: inline-block;
margin-right: 20px;

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
span {
display: inline-block;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
span {
display: inline-block;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#ib1 {
display: inline-block;
margin-right: 20px;

View File

@ -2,6 +2,9 @@
<html class="reftest-wait">
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#ib1 {
display: inline-block;
margin-right: 10px;

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
span {
display: inline-block;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
span {
display: inline-block;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#ib1 {
display: inline-block;
margin-right: 10px;

View File

@ -2,6 +2,9 @@
<html class="reftest-wait">
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline1 {
margin-right: 10px;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline1 {
margin-right: 20px;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline1 {
margin-right: 30px;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline1 {
margin-right: 10px;
}

View File

@ -2,6 +2,9 @@
<html class="reftest-wait">
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline1 {
margin-right: 10px;
}

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline2 {
margin-left: 10px;
margin-right: 40px;

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline2 {
margin-left: 10px;
margin-right: 70px;

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#inline1 {
margin-right: 10px;
}

View File

@ -2,6 +2,9 @@
<html class="reftest-wait">
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#it1 {
display: inline-table;
margin-right: 20px;

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#it1 {
display: inline-table;
margin-right: 20px;

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#it1 {
display: inline-table;
margin-right: 30px;

View File

@ -2,6 +2,9 @@
<html>
<head>
<style type="text/css">
body {
font-family: sans-serif;
}
#it1 {
display: inline-table;
margin-right: 20px;

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<body lang="en-us">
<div style="width: 5em;">
<div style="width: 5em; font-family:sans-serif;">
supercalifragilisticexpialidocious
</div>
</body>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<body lang="en-us">
<div style="width: 5em; -moz-hyphens: manual;">
<div style="width: 5em; -moz-hyphens: manual; font-family:sans-serif;">
su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
</div>
</body>

View File

@ -2,7 +2,7 @@
<html>
<!-- simple test for automatic hyphenation -->
<body lang="en-us">
<div style="width: 5em; -moz-hyphens: auto;">
<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
supercalifragilisticexpialidocious
</div>
</body>

View File

@ -2,7 +2,7 @@
<html>
<!-- adding random <span>s should not affect hyphenation -->
<body lang="en-us">
<div style="width: 5em; -moz-hyphens: auto;">
<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
super<span>cali</span>frag<span>ili</span>sti<span>cex</span>pialidoc<span>i</span>ous
</div>
</body>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<body lang="en-us">
<div style="width: 5em; -moz-hyphens: auto;">
<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
supercalifragilisticexpialidocious
<span style="-moz-hyphens:none">supercalifragilisticexpialidocious</span>
supercalifragilisticexpialidocious

View File

@ -2,7 +2,7 @@
<html>
<!-- mixed languages in a word should inhibit automatic hyphenation -->
<body lang="en-us">
<div style="width: 5em; -moz-hyphens: auto;">
<div style="width: 5em; -moz-hyphens: auto; font-family:sans-serif;">
supercalifragilisticexpialidocious
super<span lang="foo">cali</span>fragilisticexpialidocious
supercalifragilisticexpialidocious

View File

@ -42,7 +42,8 @@ fails-if(Android) skip-if(d2d||cocoaWidget) == subpixel-glyphs-x-1a.html subpixe
# design, but that is considered more tolerable because they are subpixel
# inconsistencies. On those platforms we just test that glyph positions are
# subpixel.
skip-if(!(d2d||cocoaWidget)) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
# D2D/DirectWrite results depend on the rendering mode chosen, so considering this as random for now.
skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
# No platforms do subpixel positioning vertically
== subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
== subpixel-lineheight-1a.html subpixel-lineheight-1b.html