backout 5545892376cc (Bug 737961) for Windows reftest orange
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 16 Oct 2012 16:05:52 -0700
changeset 110614 2f52467023f2ba5cd2dbfbf3eef59b0680f4180b
parent 110613 1bb0cd787de743db235f7651614d99921b174b91
child 110615 3de1ec1e38cfcb666de5ae9fe2558b0245a2eccb
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
bugs737961
milestone19.0a1
backs out5545892376ccdf9ed234accb60fcfc2d83a6b330
backout 5545892376cc (Bug 737961) for Windows reftest orange
layout/reftests/backgrounds/reftest.list
layout/reftests/mathml/reftest.list
layout/reftests/reftest-sanity/reftest.list
layout/reftests/svg/sizing/reftest.list
layout/reftests/svg/smil/transform/reftest.list
layout/tools/reftest/reftest.js
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -63,22 +63,22 @@ random-if(bug685516) == background-size-
 random-if(bug685516) == background-size-length-length.html background-size-length-length-ref.html
 random-if(bug685516) == background-size-percent-percent-stretch.html background-size-percent-percent-stretch-ref.html
 
 random-if(bug685516) == background-size-body-percent-percent.html background-size-body-percent-percent-ref.html
 random-if(bug685516) == background-size-body-percent-percent-no-repeat.html background-size-body-percent-percent-ref.html
 random-if(bug685516) == background-size-body-percent-percent-not-fixed.html background-size-body-percent-percent-ref.html
 random-if(bug685516) == background-size-body-cover.html background-size-body-cover-ref.html
 random-if(bug685516) == background-size-body-cover-no-repeat.html background-size-body-cover-ref.html
-fails-if(smallScreen) random-if(bug685516) != background-size-body-cover-not-fixed.html background-size-body-cover-ref.html
+random-if(bug685516) != background-size-body-cover-not-fixed.html background-size-body-cover-ref.html
 random-if(bug685516) != background-size-body-cover-not-fixed.html background-size-body-single-not-fixed.html
 
 # relies on reftest window having greater height than width
 random-if(bug685516) == background-size-body-contain.html background-size-body-cover-ref.html
-fails-if(smallScreen) random-if(bug685516) != background-size-body-contain-no-repeat.html background-size-body-cover-ref.html
+random-if(bug685516) != background-size-body-contain-no-repeat.html background-size-body-cover-ref.html
 random-if(bug685516) != background-size-body-contain-not-fixed.html background-size-body-cover-ref.html
 random-if(bug685516) != background-size-body-cover-not-fixed.html background-size-body-contain-not-fixed.html
 
 random-if(bug685516) != background-size-body-percent-percent-overflow.html background-size-body-percent-percent-overflow-ref.html
 
 random-if(bug685516) == background-size-zoom-no-repeat.html background-size-zoom-no-repeat-ref.html
 
 random-if(bug685516) == background-size-contain-clip-padding.html background-size-contain-clip-padding-ref.html
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -2,17 +2,17 @@
 == dir-2.html dir-2-ref.html
 == dir-3.html dir-3-ref.html
 == dir-4.html dir-4-ref.html
 == dir-5.html dir-5-ref.html
 fails == dir-6.html dir-6-ref.html
 == dir-7.html dir-7-ref.html
 fails == dir-8.html dir-8-ref.html
 fails == dir-9.html dir-9-ref.html # Bug 787215
-fails-if(smallScreen) fuzzy(255,200) == mirror-op-1.html mirror-op-1-ref.html
+fuzzy(255,200) == mirror-op-1.html mirror-op-1-ref.html
 != mirror-op-2.html mirror-op-2-ref.html
 != mirror-op-3.html mirror-op-3-ref.html
 != mirror-op-4.html mirror-op-4-ref.html
 == dynamic-mi.xhtml dynamic-mi-ref.xhtml
 == mfenced-1.xhtml mfenced-1-ref.xhtml
 == mfenced-2a.xhtml mfenced-2-ref.xhtml
 == mfenced-2b.xhtml mfenced-2-ref.xhtml
 == mfenced-3a.xhtml mfenced-3-ref.xhtml
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -63,18 +63,18 @@ asserts-if(false,6-8) load about:blank
 include scripttests.list
 
 # test url-prefix
 include urlprefixtests.list
 
 # test that all corners are visible
 != corners-1.html corners-1-ref.html
 != corners-2.html corners-2-ref.html
-fails-if(smallScreen) != corners-3.html corners-3-ref.html
-fails-if(smallScreen) != corners-4.html corners-4-ref.html 
+!= corners-3.html corners-3-ref.html
+!= corners-4.html corners-4-ref.html
 
 # Test that the harness gives the correct page dimensions.
 != page-width-3.9in.html page-width-4in.html
 == page-width-4.1in.html page-width-4in.html
 == page-width-auto.html page-width-4in.html
 != page-height-2in.html page-height-2.1in.html
 == page-height-2in.html page-height-nobreak.html
 == page-height-2.1in.html page-height-forcebreak.html
--- a/layout/reftests/svg/sizing/reftest.list
+++ b/layout/reftests/svg/sizing/reftest.list
@@ -6,17 +6,17 @@
 #
 # SVG's <svg> element is a "replaced element". The main specification texts
 # covering how the <svg> element is sized are:
 #
 #   http://www.w3.org/TR/SVGMobile12/coords.html#InitialViewport
 #   http://www.w3.org/TR/SVGMobile12/coords.html#IntrinsicSizing
 #   http://www.w3.org/TR/CSS21/visudet.html
 
-fails-if(smallScreen) != scrollbars-01.svg scrollbars-01-anti-ref.svg
+!= scrollbars-01.svg scrollbars-01-anti-ref.svg
 != scrollbars-02.svg scrollbars-01-anti-ref.svg
 
 # Standalone tests
 #
 # To get reasonable test coverage of the implementation of the replaced element
 # algorythm we test all permutations of the CSS 'width' and 'height' properties
 # having the values zero, auto, a px value or a percentage value, and of the
 # intrinsic width and height (the 'width' and 'height' attributes) having the
--- a/layout/reftests/svg/smil/transform/reftest.list
+++ b/layout/reftests/svg/smil/transform/reftest.list
@@ -7,9 +7,9 @@ fuzzy-if(cocoaWidget&&layersGPUAccelerat
 == rotate-angle-2.svg rotate-angle-ref.svg
 == rotate-angle-3.svg rotate-angle-ref.svg
 fuzzy-if(Android,16,2) == rotate-angle-4.svg rotate-angle-ref.svg
 == rotate-angle-5.svg rotate-angle-ref.svg
 == scale-1.svg scale-1-ref.svg
 fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,45) == skew-1.svg skew-1-ref.svg
 random-if(Android&&!browserIsRemote) == translate-clipPath-1.svg lime.svg # bug 760266
 fails-if(OSX==10.6) == translate-gradient-1.svg lime.svg
-fails-if(smallScreen) == translate-pattern-1.svg lime.svg
+== translate-pattern-1.svg lime.svg
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -498,21 +498,16 @@ function BuildConditionSandbox(aURL) {
     // xr.XPCOMABI throws exception for configurations without full ABI
     // support (mobile builds on ARM)
     try {
         sandbox.xulRuntime.XPCOMABI = xr.XPCOMABI;
     } catch(e) {
         sandbox.xulRuntime.XPCOMABI = "";
     }
 
-    var testRect = gBrowser.getBoundingClientRect();
-    sandbox.smallScreen = false;
-    if (gContainingWindow.innerWidth < 800 || gContainingWindow.innerHeight < 1000) {
-        sandbox.smallScreen = true;
-    }
 
 #if REFTEST_B2G
     // XXX nsIGfxInfo isn't available in B2G
     sandbox.d2d = false;
     sandbox.azureQuartz = false;
     sandbox.azureSkia = false;
     sandbox.contentSameGfxBackendAsCanvas = false;
 #else