Bug 1295466 - Revert w3c-css/submitted/ui3/box-sizing-replaced-001.xht to remove previously added MozReftestInvalidate and add fuzzy anotation for this test r?dholbert
MozReview-Commit-ID: JuN4bWDPkK1
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-001.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-001.xht
@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Min/Max Height and Width Constraints on Replaced Elements with Box-Sizing</title>
<link href="http://fantasai.inkedblade.net/contact" title="Elika J. Etemad" rel="author"></link>
<link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
<link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
<link rel="match" href="box-sizing-replaced-001-ref.xht" />
<meta content="image" name="flags"></meta>
<meta name="assert" content="All images should be sized at 75px x 75px, with 5px of padding around each." />
@@ -126,27 +126,16 @@
}
#img19 {
max-width: 85px;
min-height: 85px;
}
</style>
</head>
- <script>
- /* this test shouldn't need reftest-wait, but if the reftest snapshot is triggered before we've painted,
- * for img5 the right 1/3rd of the element simply isn't painted.
- * See Bug 1283302
- */
- window.addEventListener("MozReftestInvalidate", endTest);
-
- function endTest() {
- document.documentElement.removeAttribute("class");
- }
- </script>
<body>
<div>All rectangles should be the same size.</div>
<p><img id="img0" class="with-padding" src="support/replaced-min-max.png" alt="FAIL" title="Test 0"></img></p>
<p><img id="img1" class="with-padding" title="Test 1" alt="FAIL" src="support/replaced-min-max-1.png"></img></p>
<p><img id="img2" class="with-padding" title="Test 2" alt="FAIL" src="support/replaced-min-max-2.png"></img></p>
<p><img id="img3" class="with-padding" title="Test 3" alt="FAIL" src="support/replaced-min-max-3.png"></img></p>
<p><img id="img4" class="with-padding" title="Test 4" alt="FAIL" src="support/replaced-min-max-4.png"></img></p>
<p><img id="img5" class="with-padding" title="Test 5" alt="FAIL" src="support/replaced-min-max-5.png"></img></p>
--- a/layout/reftests/w3c-css/submitted/ui3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/ui3/reftest.list
@@ -1,10 +1,10 @@
== box-sizing-border-box-001.xht box-sizing-border-box-001-ref.xht
== box-sizing-border-box-002.xht box-sizing-border-box-002-ref.xht
== box-sizing-border-box-003.xht box-sizing-border-box-003-ref.xht
== box-sizing-border-box-004.xht box-sizing-border-box-004-ref.xht
== box-sizing-content-box-001.xht box-sizing-content-box-001-ref.xht
== box-sizing-content-box-002.xht box-sizing-content-box-002-ref.xht
== box-sizing-content-box-003.xht box-sizing-content-box-003-ref.xht
-random-if(Android) fuzzy-if(skiaContent,15,50) == box-sizing-replaced-001.xht box-sizing-replaced-001-ref.xht #bug 982547
+random-if(Android) fuzzy-if(skiaContent,15,50) fuzzy-if(OSX,255,1575) == box-sizing-replaced-001.xht box-sizing-replaced-001-ref.xht # bug 982547, Bug 1295466
fuzzy-if(Android,27,874) fuzzy-if(gtkWidget,14,29) == box-sizing-replaced-002.xht box-sizing-replaced-002-ref.xht # Bug 1128229, Bug 1313772
fuzzy-if(Android,27,925) fuzzy-if(gtkWidget,14,43) == box-sizing-replaced-003.xht box-sizing-replaced-003-ref.xht # Bug 1128229
