bug 722014 - backout changeset c8ea6b7164bc (test from bug 698652) due to intermittent reftest oranges on OS X and WinXP.
authorJonathan Kew <jfkthame@gmail.com>
Sat, 28 Jan 2012 16:10:02 +0000
changeset 86892 bcaff471b3850653e73a4bb9427475f65d99afac
parent 86891 0529bd4e33bd98387942bdf433c3c8657d53d332
child 86893 f8282085e2257a7728ded0af5702a9d37d5e38c9
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs722014, 698652
milestone12.0a1
bug 722014 - backout changeset c8ea6b7164bc (test from bug 698652) due to intermittent reftest oranges on OS X and WinXP.
layout/reftests/canvas/reftest.list
layout/reftests/canvas/text-ignore-min-size-ref.html
layout/reftests/canvas/text-ignore-min-size.html
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -40,18 +40,16 @@ asserts-if(cocoaWidget,0-2) == size-chan
 == text-bidi-ltr-test.html text-bidi-ltr-ref.html
 != text-bidi-ltr-test.html text-bidi-ltr-notref.html # for bug 698185
 == text-bidi-rtl-test.html text-bidi-rtl-ref.html
 
 fails-if(Android) != text-font-lang.html text-font-lang-notref.html
 
 == text-measure.html text-measure-ref.html
 
-pref(font.minimum-size.x-western,48) != text-ignore-min-size.html text-ignore-min-size-ref.html
-
 == strokeText-path.html strokeText-path-ref.html
 
 # azure quartz uses CGDrawLinearGradient instead of DrawShading
 # so we have less control over degenerate behaviour as tested by this
 # test
 fails-if(azureQuartz) == linear-gradient-1a.html linear-gradient-1-ref.html
 
 # this passes with cairo on 10.7 but not with azure for reasons unknown
deleted file mode 100644
--- a/layout/reftests/canvas/text-ignore-min-size-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html lang="en">
-<script>
-function load() {
-    var ctx = document.getElementById("canvas").getContext("2d");
-
-    ctx.font = "bold 48px sans-serif";
-    ctx.scale(4, 4);
-    var str = "HeHeHeHe";
-    ctx.fillText(str, 0, 48);
-}
-</script>
-<body onload="load();">
-<canvas id="canvas" width="400" height="200"></canvas>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/canvas/text-ignore-min-size.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html lang="en">
-<script>
-function load() {
-    var ctx = document.getElementById("canvas").getContext("2d");
-
-    ctx.font = "bold 12px sans-serif";
-    ctx.scale(4, 4);
-    var str = "HeHeHeHe";
-    ctx.fillText(str, 0, 48);
-}
-</script>
-<body onload="load();">
-<canvas id="canvas" width="400" height="200"></canvas>
-</body>
-</html>