Bug 879494. Remove bug685516 annotations from reftests, they are not needed anymore. r=khuey
authorTimothy Nikkel <tnikkel@gmail.com>
Wed, 05 Jun 2013 00:18:54 -0500
changeset 134058 1b59918a721088648463e339e847bd56205cccdf
parent 134057 902172f7b451110fd27cd79c1fdc0ae09d690136
child 134059 68c5b7f4c7ee5670283cb73af15f0c60f10b4048
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerskhuey
bugs879494, 685516
milestone24.0a1
Bug 879494. Remove bug685516 annotations from reftests, they are not needed anymore. r=khuey
gfx/tests/reftest/reftest.list
image/test/reftest/color-management/reftest.list
image/test/reftest/gif/reftest.list
image/test/reftest/jpeg/reftest.list
image/test/reftest/pngsuite-basic-n/reftest.list
image/test/reftest/pngsuite-filtering/reftest.list
image/test/reftest/pngsuite-oddsizes/reftest.list
layout/reftests/backgrounds/reftest.list
layout/reftests/box-properties/reftest.list
layout/reftests/css-calc/reftest.list
layout/reftests/image-rect/reftest.list
layout/reftests/image/reftest.list
layout/reftests/pixel-rounding/reftest.list
layout/reftests/scrolling/reftest.list
layout/reftests/svg/as-image/reftest.list
layout/reftests/table-background/reftest.list
layout/reftests/w3c-css/submitted/values3/reftest.list
layout/tools/reftest/reftest.js
--- a/gfx/tests/reftest/reftest.list
+++ b/gfx/tests/reftest/reftest.list
@@ -1,4 +1,4 @@
 # 468496-1 will also detect bugs in video drivers.
 == 468496-1.html 468496-1-ref.html
-random-if(bug685516) == 611498-1.html 611498-ref.html
+== 611498-1.html 611498-ref.html
 skip-if(B2G) == 709477-1.html 709477-1-ref.html # bug 773482
--- a/image/test/reftest/color-management/reftest.list
+++ b/image/test/reftest/color-management/reftest.list
@@ -1,7 +1,7 @@
 # Colormangement
 
 # test for bug 489133, test for bug 460520
-random-if(bug685516) == invalid-chrm.png invalid-chrm-ref.png
-random-if(bug685516) == invalid-whitepoint.png invalid-chrm-ref.png
+== invalid-chrm.png invalid-chrm-ref.png
+== invalid-whitepoint.png invalid-chrm-ref.png
 # test for bug 488955
-random-if(bug685516) == trc-type.html trc-type-ref.html
+== trc-type.html trc-type-ref.html
--- a/image/test/reftest/gif/reftest.list
+++ b/image/test/reftest/gif/reftest.list
@@ -1,21 +1,21 @@
 # GIF tests 
 
 # tests for bug 519589
-random-if(bug685516) == 1bit-255-trans.gif 1bit-255-trans.png
-random-if(bug685516) == in-colormap-trans.gif in-colormap-trans.png
-random-if(bug685516) == out-of-colormap-trans.gif out-of-colormap-trans.png
+== 1bit-255-trans.gif 1bit-255-trans.png
+== in-colormap-trans.gif in-colormap-trans.png
+== out-of-colormap-trans.gif out-of-colormap-trans.png
 
 # a GIF file that uses the comment extension
-random-if(bug685516) == comment.gif comment.png
+== comment.gif comment.png
 
 # a GIF file with a background smaller than the size of the canvas
-random-if(bug685516) == small-background-size.gif small-background-size-ref.gif
-random-if(bug685516) == small-background-size-2.gif small-background-size-2-ref.gif
+== small-background-size.gif small-background-size-ref.gif
+== small-background-size-2.gif small-background-size-2-ref.gif
 
 # a transparent gif that disposes previous frames with clear; we must properly
 # clear each frame to pass.
 random == delaytest.html?transparent-animation.gif transparent-animation-finalframe.gif # incorrect timing dependence (bug 558678)
 
 # test for bug 641198
 skip-if(B2G) random-if(Android) == test_bug641198.html animation2a-finalframe.gif # bug 773482
 
@@ -36,9 +36,9 @@ skip-if(B2G) random-if(Android) == test_
 # \r\n
 # <contents of blue.gif> (no newline)
 # --BOUNDARYOMG--\r\n
 # 
 # (The boundary is arbitrary, and just has to be defined as something that
 # won't be in the text of the contents themselves. --$(boundary)\r\n means
 # "Here is the beginning of a boundary," and --$(boundary)-- means "All done
 # sending you parts.")
-skip-if(B2G) random-if(bug685516) HTTP == webcam.html blue.gif # bug 773482
+skip-if(B2G) HTTP == webcam.html blue.gif # bug 773482
--- a/image/test/reftest/jpeg/reftest.list
+++ b/image/test/reftest/jpeg/reftest.list
@@ -1,34 +1,34 @@
 # JPEG tests 
 
 # Images of various sizes.
-random-if(bug685516) == jpg-size-1x1.jpg   jpg-size-1x1.png
-random-if(bug685516) == jpg-size-2x2.jpg   jpg-size-2x2.png
-random-if(bug685516) == jpg-size-3x3.jpg   jpg-size-3x3.png
-random-if(bug685516) == jpg-size-4x4.jpg   jpg-size-4x4.png
-random-if(bug685516) == jpg-size-5x5.jpg   jpg-size-5x5.png
-random-if(bug685516) == jpg-size-6x6.jpg   jpg-size-6x6.png
-random-if(bug685516) == jpg-size-7x7.jpg   jpg-size-7x7.png
-random-if(bug685516) == jpg-size-8x8.jpg   jpg-size-8x8.png
-random-if(bug685516) == jpg-size-9x9.jpg   jpg-size-9x9.png
-random-if(bug685516) == jpg-size-15x15.jpg jpg-size-15x15.png
-random-if(bug685516) == jpg-size-16x16.jpg jpg-size-16x16.png
-random-if(bug685516) == jpg-size-17x17.jpg jpg-size-17x17.png
-random-if(bug685516) == jpg-size-31x31.jpg jpg-size-31x31.png
-random-if(bug685516) == jpg-size-32x32.jpg jpg-size-32x32.png
-random-if(bug685516) == jpg-size-33x33.jpg jpg-size-33x33.png
+== jpg-size-1x1.jpg   jpg-size-1x1.png
+== jpg-size-2x2.jpg   jpg-size-2x2.png
+== jpg-size-3x3.jpg   jpg-size-3x3.png
+== jpg-size-4x4.jpg   jpg-size-4x4.png
+== jpg-size-5x5.jpg   jpg-size-5x5.png
+== jpg-size-6x6.jpg   jpg-size-6x6.png
+== jpg-size-7x7.jpg   jpg-size-7x7.png
+== jpg-size-8x8.jpg   jpg-size-8x8.png
+== jpg-size-9x9.jpg   jpg-size-9x9.png
+== jpg-size-15x15.jpg jpg-size-15x15.png
+== jpg-size-16x16.jpg jpg-size-16x16.png
+== jpg-size-17x17.jpg jpg-size-17x17.png
+== jpg-size-31x31.jpg jpg-size-31x31.png
+== jpg-size-32x32.jpg jpg-size-32x32.png
+== jpg-size-33x33.jpg jpg-size-33x33.png
 # Progressive encoding
-random-if(bug685516) == jpg-progressive.jpg jpg-progressive.png
+== jpg-progressive.jpg jpg-progressive.png
 # Grayscale colorspace
-random-if(bug685516) == jpg-gray.jpg jpg-gray.png
+== jpg-gray.jpg jpg-gray.png
 # CMYK colorspace
-random-if(bug685516) == jpg-cmyk-1.jpg jpg-cmyk-1.png
-random-if(bug685516) == jpg-cmyk-2.jpg jpg-cmyk-2.png
-random-if(bug685516) == jpg-srgb-icc.jpg jpg-srgb-icc.png
+== jpg-cmyk-1.jpg jpg-cmyk-1.png
+== jpg-cmyk-2.jpg jpg-cmyk-2.png
+== jpg-srgb-icc.jpg jpg-srgb-icc.png
 
 # webcam-simulacrum.mjpg is a hand-edited file containing red.jpg and blue.jpg,
 # concatenated together with the relevant headers for
 # multipart/x-mixed-replace. Specifically, with the headers in
 # webcam-simulacrum.mjpg^headers^, the web browser will get the following:
 #
 # HTTP 200 OK
 # Content-Type: multipart/x-mixed-replace;boundary=BOUNDARYOMG
@@ -42,9 +42,9 @@ random-if(bug685516) == jpg-srgb-icc.jpg
 # \r\n
 # <contents of blue.jpg> (no newline)
 # --BOUNDARYOMG--\r\n
 # 
 # (The boundary is arbitrary, and just has to be defined as something that
 # won't be in the text of the contents themselves. --$(boundary)\r\n means
 # "Here is the beginning of a boundary," and --$(boundary)-- means "All done
 # sending you parts.")
-random-if(bug685516) HTTP == webcam-simulacrum.mjpg blue.jpg
+HTTP == webcam-simulacrum.mjpg blue.jpg
--- a/image/test/reftest/pngsuite-basic-n/reftest.list
+++ b/image/test/reftest/pngsuite-basic-n/reftest.list
@@ -1,29 +1,29 @@
 # PngSuite - Basic formats (non-interlaced)
 
 
 # basn0g01 - black & white
-random-if(bug685516) == basn0g01.png basn0g01.html
+== basn0g01.png basn0g01.html
 # basn0g02 - 2 bit (4 level) grayscale
 fails-if(Android) == basn0g02.png basn0g02.html
 # basn0g04 - 4 bit (16 level) grayscale
 fails-if(Android) == basn0g04.png basn0g04.html
 # basn0g08 - 8 bit (256 level) grayscale
 fails-if(Android) == basn0g08.png basn0g08.html
 # basn0g16 - 16 bit (64k level) grayscale
 fails-if(Android) == basn0g16.png basn0g16.html
 # basn2c08 - 3x8 bits rgb color
 fails-if(Android) == basn2c08.png basn2c08.html
 # basn2c16 - 3x16 bits rgb color
 fails-if(Android) == basn2c16.png basn2c16.html
 # basn3p01 - 1 bit (2 color) paletted
 fails-if(Android) == basn3p01.png basn3p01.html
 # basn3p02 - 2 bit (4 color) paletted
-random-if(bug685516) == basn3p02.png basn3p02.html
+== basn3p02.png basn3p02.html
 # basn3p04 - 4 bit (16 color) paletted
 fails-if(Android) == basn3p04.png basn3p04.html
 # basn3p08 - 8 bit (256 color) paletted
 fails-if(Android) == basn3p08.png basn3p08.html
 # basn4a08 - 8 bit grayscale + 8 bit alpha-channel
 #== basn4a08.png basn4a08.html
 # basn4a16 - 16 bit grayscale + 16 bit alpha-channel
 #== basn4a16.png basn4a16.html
--- a/image/test/reftest/pngsuite-filtering/reftest.list
+++ b/image/test/reftest/pngsuite-filtering/reftest.list
@@ -1,22 +1,22 @@
 # PngSuite - Image filtering
 
 # f00n0g08 - grayscale, no interlacing, filter-type 0
-random-if(bug685516) == f00n0g08.png f00n0g08.html
+== f00n0g08.png f00n0g08.html
 # f00n2c08 - color, no interlacing, filter-type 0
-random-if(bug685516) == f00n2c08.png f00n2c08.html
+== f00n2c08.png f00n2c08.html
 # f01n0g08 - grayscale, no interlacing, filter-type 1
-random-if(bug685516) == f01n0g08.png f01n0g08.html
+== f01n0g08.png f01n0g08.html
 # f01n2c08 - color, no interlacing, filter-type 1
-random-if(bug685516) == f01n2c08.png f01n2c08.html
+== f01n2c08.png f01n2c08.html
 # f02n0g08 - grayscale, no interlacing, filter-type 2
-random-if(bug685516) == f02n0g08.png f02n0g08.html
+== f02n0g08.png f02n0g08.html
 # f02n2c08 - color, no interlacing, filter-type 2
-random-if(bug685516) == f02n2c08.png f02n2c08.html
+== f02n2c08.png f02n2c08.html
 # f03n0g08 - grayscale, no interlacing, filter-type 3
-random-if(bug685516) == f03n0g08.png f03n0g08.html
+== f03n0g08.png f03n0g08.html
 # f03n2c08 - color, no interlacing, filter-type 3
-random-if(bug685516) == f03n2c08.png f03n2c08.html
+== f03n2c08.png f03n2c08.html
 # f04n0g08 - grayscale, no interlacing, filter-type 4
-random-if(bug685516) == f04n0g08.png f04n0g08.html
+== f04n0g08.png f04n0g08.html
 # f04n2c08 - color, no interlacing, filter-type 4 
-random-if(bug685516) == f04n2c08.png f04n2c08.html
+== f04n2c08.png f04n2c08.html
--- a/image/test/reftest/pngsuite-oddsizes/reftest.list
+++ b/image/test/reftest/pngsuite-oddsizes/reftest.list
@@ -1,21 +1,21 @@
 # PngSuite - Odd sizes
 #
 # Note: For each size, there are 2 PNGs (one interlaced, one not). Both
 # versions look identical, so they share a common HTML reference file.
 
 # s01i3p01 - 1x1 paletted file, interlaced
-random-if(bug685516) == s01i3p01.png s01_3p01.html
+== s01i3p01.png s01_3p01.html
 # s01n3p01 - 1x1 paletted file, no interlacing
-random-if(bug685516) == s01n3p01.png s01_3p01.html
+== s01n3p01.png s01_3p01.html
 # s02i3p01 - 2x2 paletted file, interlaced
-random-if(bug685516) == s02i3p01.png s02_3p01.html
+== s02i3p01.png s02_3p01.html
 # s02n3p01 - 2x2 paletted file, no interlacing
-random-if(bug685516) == s02n3p01.png s02_3p01.html
+== s02n3p01.png s02_3p01.html
 # s03i3p01 - 3x3 paletted file, interlaced
 fails-if(Android) == s03i3p01.png s03_3p01.html
 # s03n3p01 - 3x3 paletted file, no interlacing
 fails-if(Android) == s03n3p01.png s03_3p01.html
 # s04i3p01 - 4x4 paletted file, interlaced
 fails-if(Android) == s04i3p01.png s04_3p01.html
 # s04n3p01 - 4x4 paletted file, no interlacing
 fails-if(Android) == s04n3p01.png s04_3p01.html
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -1,96 +1,96 @@
 include gradient/reftest.list
 include vector/reftest.list
 
-skip-if(B2G) random-if(bug685516) == layers-stacking-order.xhtml layers-stacking-order-ref.xhtml
-skip-if(B2G) random-if(bug685516) == layers-layer-count-cascade-1.xhtml layers-layer-count-1-ref.xhtml
-random-if(bug685516) == layers-layer-count-inheritance-1.xhtml layers-layer-count-1-ref.xhtml
-random-if(bug685516) == layers-layer-count-cascade-2.xhtml layers-layer-count-2-ref.xhtml
-random-if(bug685516) == layers-layer-count-inheritance-2.xhtml layers-layer-count-2-ref.xhtml
+skip-if(B2G) == layers-stacking-order.xhtml layers-stacking-order-ref.xhtml
+skip-if(B2G) == layers-layer-count-cascade-1.xhtml layers-layer-count-1-ref.xhtml
+== layers-layer-count-inheritance-1.xhtml layers-layer-count-1-ref.xhtml
+== layers-layer-count-cascade-2.xhtml layers-layer-count-2-ref.xhtml
+== layers-layer-count-inheritance-2.xhtml layers-layer-count-2-ref.xhtml
 fuzzy-if(Android,9,600000) == viewport-translucent-color-1.html viewport-translucent-color-ref.html
 fails-if(Android) == viewport-translucent-color-2.html viewport-translucent-color-ref.html
 fails-if(Android) == viewport-translucent-color-3.html viewport-translucent-color-ref.html
 != viewport-translucent-color-ref.html about:blank
-random-if(bug685516) == iframe-translucent-color-1.html iframe-translucent-color-ref.html
-random-if(bug685516) == translucent-color-1.html translucent-color-ref.html
-random-if(bug685516) == translucent-color-2.html translucent-color-ref.html
-random-if(bug685516) == translucent-color-3.html translucent-color-ref.html
+== iframe-translucent-color-1.html iframe-translucent-color-ref.html
+== translucent-color-1.html translucent-color-ref.html
+== translucent-color-2.html translucent-color-ref.html
+== translucent-color-3.html translucent-color-ref.html
 != translucent-color-ref.html about:blank
 skip-if(B2G) == root-element-display-none-1.html root-element-display-none-ref.html
-random-if(bug685516) == continuous-inline-1a.html continuous-inline-1ab-ref.html
-random-if(bug685516) == continuous-inline-1b.html continuous-inline-1ab-ref.html
-random-if(bug685516) == continuous-inline-1c.html continuous-inline-1cd-ref.html
-random-if(bug685516) == continuous-inline-1d.html continuous-inline-1cd-ref.html
-random-if(bug685516) == continuous-inline-2a.html continuous-inline-2-ref.html
-random-if(bug685516) == continuous-inline-2b.html continuous-inline-2-ref.html
-random-if(bug685516) == continuous-inline-3.html continuous-inline-3-ref.html
-skip-if(B2G) random-if(bug685516) == continuous-inline-4a.html continuous-inline-4-ref.html
-skip-if(B2G) random-if(bug685516) == continuous-inline-4b.html continuous-inline-4-ref.html
-random-if(bug685516) == continuous-inline-5a.html continuous-inline-5-ref.html
-random-if(bug685516) == continuous-inline-5b.html continuous-inline-5-ref.html
-random-if(bug685516) == background-redraw-237766.html background-redraw-237766-ref.html
+== continuous-inline-1a.html continuous-inline-1ab-ref.html
+== continuous-inline-1b.html continuous-inline-1ab-ref.html
+== continuous-inline-1c.html continuous-inline-1cd-ref.html
+== continuous-inline-1d.html continuous-inline-1cd-ref.html
+== continuous-inline-2a.html continuous-inline-2-ref.html
+== continuous-inline-2b.html continuous-inline-2-ref.html
+== continuous-inline-3.html continuous-inline-3-ref.html
+skip-if(B2G) == continuous-inline-4a.html continuous-inline-4-ref.html
+skip-if(B2G) == continuous-inline-4b.html continuous-inline-4-ref.html
+== continuous-inline-5a.html continuous-inline-5-ref.html
+== continuous-inline-5b.html continuous-inline-5-ref.html
+== background-redraw-237766.html background-redraw-237766-ref.html
 
-random-if(bug685516) == background-clip-1.html background-clip-1-ref.html
-random-if(bug685516) == background-clip-2.html background-clip-2-ref.html
+== background-clip-1.html background-clip-1-ref.html
+== background-clip-2.html background-clip-2-ref.html
 
-skip-if(B2G) random-if(bug685516) == background-position-1a.html background-position-1-ref.html
-random-if(bug685516) == background-position-1b.html background-position-1-ref.html
-random-if(bug685516) == background-position-1c.html background-position-1-ref.html
-random-if(bug685516) == background-position-2a.html background-position-2-ref.html
-random-if(bug685516) == background-position-2b.html background-position-2-ref.html
-random-if(bug685516) == background-position-3a.html background-position-3-ref.html
-random-if(bug685516) == background-position-3b.html background-position-3-ref.html
-random-if(bug685516) == background-position-4a.html background-position-4-ref.html
-random-if(bug685516) == background-position-4b.html background-position-4-ref.html
-random-if(bug685516) == background-position-4c.html background-position-4-ref.html
-random-if(bug685516) == background-position-5.html background-position-5-ref.html
-random-if(bug685516) == background-position-6.html background-position-6-ref.html
-random-if(bug685516) == background-position-7.html background-position-7-ref.html
-random-if(bug685516) == background-position-8.html background-position-8-ref.html
+skip-if(B2G) == background-position-1a.html background-position-1-ref.html
+== background-position-1b.html background-position-1-ref.html
+== background-position-1c.html background-position-1-ref.html
+== background-position-2a.html background-position-2-ref.html
+== background-position-2b.html background-position-2-ref.html
+== background-position-3a.html background-position-3-ref.html
+== background-position-3b.html background-position-3-ref.html
+== background-position-4a.html background-position-4-ref.html
+== background-position-4b.html background-position-4-ref.html
+== background-position-4c.html background-position-4-ref.html
+== background-position-5.html background-position-5-ref.html
+== background-position-6.html background-position-6-ref.html
+== background-position-7.html background-position-7-ref.html
+== background-position-8.html background-position-8-ref.html
 
-random-if(bug685516) == background-size-auto-auto.html background-size-auto-ref.html
-random-if(bug685516) == background-size-auto.html background-size-auto-ref.html
-random-if(bug685516) == background-size-contain.html background-size-contain-ref.html
-random-if(bug685516) == background-size-cover.html background-size-cover-ref.html
-random-if(bug685516) == background-size-auto-length.html background-size-auto-length-ref.html
-random-if(bug685516) == background-size-length-auto.html background-size-auto-length-ref.html
-random-if(bug685516) == background-size-length.html background-size-auto-length-ref.html
-random-if(bug685516) == background-size-auto-percent.html background-size-auto-length-ref.html
-random-if(bug685516) == background-size-percent-auto.html background-size-auto-length-ref.html
-random-if(bug685516) == background-size-percent.html background-size-auto-length-ref.html
-random-if(bug685516) == background-size-length-percent.html background-size-length-percent-ref.html
-random-if(bug685516) == background-size-percent-length.html background-size-length-percent-ref.html
-random-if(bug685516) == background-size-percent-percent.html background-size-percent-percent-ref.html
-random-if(bug685516) == background-size-length-length.html background-size-length-length-ref.html
-skip-if(B2G) random-if(bug685516) == background-size-percent-percent-stretch.html background-size-percent-percent-stretch-ref.html # bug 773482
+== background-size-auto-auto.html background-size-auto-ref.html
+== background-size-auto.html background-size-auto-ref.html
+== background-size-contain.html background-size-contain-ref.html
+== background-size-cover.html background-size-cover-ref.html
+== background-size-auto-length.html background-size-auto-length-ref.html
+== background-size-length-auto.html background-size-auto-length-ref.html
+== background-size-length.html background-size-auto-length-ref.html
+== background-size-auto-percent.html background-size-auto-length-ref.html
+== background-size-percent-auto.html background-size-auto-length-ref.html
+== background-size-percent.html background-size-auto-length-ref.html
+== background-size-length-percent.html background-size-length-percent-ref.html
+== background-size-percent-length.html background-size-length-percent-ref.html
+== background-size-percent-percent.html background-size-percent-percent-ref.html
+== background-size-length-length.html background-size-length-length-ref.html
+skip-if(B2G) == background-size-percent-percent-stretch.html background-size-percent-percent-stretch-ref.html # bug 773482
 
-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&&Android) 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
+== background-size-body-percent-percent.html background-size-body-percent-percent-ref.html
+== background-size-body-percent-percent-no-repeat.html background-size-body-percent-percent-ref.html
+== background-size-body-percent-percent-not-fixed.html background-size-body-percent-percent-ref.html
+== background-size-body-cover.html background-size-body-cover-ref.html
+== background-size-body-cover-no-repeat.html background-size-body-cover-ref.html
+fails-if(smallScreen&&Android) != background-size-body-cover-not-fixed.html background-size-body-cover-ref.html
+!= 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&&Android) 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
+== background-size-body-contain.html background-size-body-cover-ref.html
+fails-if(smallScreen&&Android) != background-size-body-contain-no-repeat.html background-size-body-cover-ref.html
+!= background-size-body-contain-not-fixed.html background-size-body-cover-ref.html
+!= 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
+!= 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
+== 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
-random-if(bug685516) == background-size-contain-clip-border.html background-size-contain-clip-border-ref.html
-random-if(bug685516) == background-size-contain-position-fifty-fifty.html background-size-contain-position-fifty-fifty-ref.html
-random-if(bug685516) == background-size-contain-clip-padding-origin-border.html background-size-contain-clip-padding-origin-border-ref.html
-random-if(bug685516) == background-size-contain-clip-padding-origin-border-padding.html background-size-contain-clip-padding-origin-border-padding-ref.html
+== background-size-contain-clip-padding.html background-size-contain-clip-padding-ref.html
+== background-size-contain-clip-border.html background-size-contain-clip-border-ref.html
+== background-size-contain-position-fifty-fifty.html background-size-contain-position-fifty-fifty-ref.html
+== background-size-contain-clip-padding-origin-border.html background-size-contain-clip-padding-origin-border-ref.html
+== background-size-contain-clip-padding-origin-border-padding.html background-size-contain-clip-padding-origin-border-padding-ref.html
 
 skip-if(B2G) == background-layers-1a.html background-layers-1-ref.html # bug 773482
 == background-layers-1b.html background-layers-1-ref.html
 
 # -moz-background-inline-policy is touchy and hard to test due to stretching
 # artifacts and the difficulty of covering exact lines, and its CSS3 analog is
 # on the chopping block at the moment, so just make sure background-size results
 # in a different rendering when present.
@@ -99,45 +99,45 @@ skip-if(B2G) == background-layers-1a.htm
 != background-size-cover-bounding-box.html background-size-bounding-box.html
 
 # ...and make sure each rendering with background-size is different from the
 # others
 != background-size-cover-continuous.html background-size-cover-each-box.html
 != background-size-cover-continuous.html background-size-cover-bounding-box.html
 != background-size-cover-each-box.html background-size-cover-bounding-box.html
 
-random-if(bug685516) == background-size-monster-ch.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-cm.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-em.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-ex.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-inches.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-mm.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-pc.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-pt.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-px.html background-size-monster-ref.html
-random-if(bug685516) == background-size-monster-rem.html background-size-monster-ref.html
+== background-size-monster-ch.html background-size-monster-ref.html
+== background-size-monster-cm.html background-size-monster-ref.html
+== background-size-monster-em.html background-size-monster-ref.html
+== background-size-monster-ex.html background-size-monster-ref.html
+== background-size-monster-inches.html background-size-monster-ref.html
+== background-size-monster-mm.html background-size-monster-ref.html
+== background-size-monster-pc.html background-size-monster-ref.html
+== background-size-monster-pt.html background-size-monster-ref.html
+== background-size-monster-px.html background-size-monster-ref.html
+== background-size-monster-rem.html background-size-monster-ref.html
 
 # There seems to be a pixel-snapping problem here, where the repeated background
 # image isn't being snapped at its boundaries.  Note that the boundaries within
 # the image aren't the issue, because they're being obscured to avoid sampling
 # algorithm dependencies (at least assuming the sampling algorithm in use
 # doesn't sample too far astray from the boundaries).
 fails == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
 
 # -moz-default-background-color and -moz-default-color (bug 591341)
 == background-moz-default-background-color.html background-moz-default-background-color-ref.html
 
-random-if(bug685516||B2G) == fixed-bg-with-transform-outside-viewport-1.html fixed-bg-with-transform-outside-viewport-ref.html
+random-if(B2G) == fixed-bg-with-transform-outside-viewport-1.html fixed-bg-with-transform-outside-viewport-ref.html
 
-random-if(bug685516) HTTP == root-background-1.html root-background-ref.html
-random-if(bug685516) HTTP != root-background-1.html about:blank
+HTTP == root-background-1.html root-background-ref.html
+HTTP != root-background-1.html about:blank
 
-random-if(bug685516||B2G) == really-big-background.html really-big-background-ref.html
-random-if(bug685516) == body-background.html body-background-ref.html
-random-if(bug685516) == table-background.html table-background-ref.html
-random-if(bug685516) == table-background-print.html table-background-print-ref.html
-random-if(bug685516) != div-background.html div-background-ref.html
+random-if(B2G) == really-big-background.html really-big-background-ref.html
+== body-background.html body-background-ref.html
+== table-background.html table-background-ref.html
+== table-background-print.html table-background-print-ref.html
+!= div-background.html div-background-ref.html
 
-random-if(bug685516) == background-repeat-1-ref.html background-repeat-1.html
+== background-repeat-1-ref.html background-repeat-1.html
 
-random-if(bug685516) == multi-background-clip-content-border.html multi-background-clip-content-border-ref.html
+== multi-background-clip-content-border.html multi-background-clip-content-border-ref.html
 
 HTTP == background-referrer.html background-referrer-ref.html
--- a/layout/reftests/box-properties/reftest.list
+++ b/layout/reftests/box-properties/reftest.list
@@ -17,14 +17,14 @@
 == box-sizing-3.html box-sizing-1-ref.html
 == box-sizing-4.html box-sizing-4-ref.html
 == box-sizing-minmax-height.html box-sizing-minmax-height-ref.html
 == box-sizing-minmax-width.html box-sizing-minmax-width-ref.html
 == box-sizing-mozbox-minmax-height.html box-sizing-mozbox-minmax-height-ref.html
 skip-if(B2G) == abspos-non-replaced-width-offset-margin.html abspos-non-replaced-width-offset-margin-ref.html
 skip-if(B2G) == abspos-replaced-width-offset-margin.html abspos-replaced-width-offset-margin-ref.html
 skip-if(B2G) HTTP(..) == CSS21-t100301.xhtml CSS21-t100301-ref.xhtml
-random-if(bug685516||B2G) == CSS21-t100303.xhtml CSS21-t100303-ref.xhtml
-random-if(bug685516||B2G) == CSS21-t100303-simple.xhtml CSS21-t100303-ref.xhtml
-random-if(bug685516||B2G) == CSS21-t100801-vertical-align.xhtml CSS21-t100801-vertical-align-ref.xhtml
+random-if(B2G) == CSS21-t100303.xhtml CSS21-t100303-ref.xhtml
+random-if(B2G) == CSS21-t100303-simple.xhtml CSS21-t100303-ref.xhtml
+random-if(B2G) == CSS21-t100801-vertical-align.xhtml CSS21-t100801-vertical-align-ref.xhtml
 == clip-auto.html clip-auto-ref.html
 == clip-rect-auto.html clip-rect-auto-ref.html
 == width-rounding.html width-rounding-ref.html
--- a/layout/reftests/css-calc/reftest.list
+++ b/layout/reftests/css-calc/reftest.list
@@ -1,1 +1,1 @@
-random-if(bug685516) == background-image-gradient-1.html background-image-gradient-1-ref.html
+== background-image-gradient-1.html background-image-gradient-1-ref.html
--- a/layout/reftests/image-rect/reftest.list
+++ b/layout/reftests/image-rect/reftest.list
@@ -1,16 +1,16 @@
-skip-if(B2G) random-if(bug685516) == background-common-usage-floating-point.html background-common-usage-ref.html # bug 773482
-random-if(bug685516) == background-common-usage-percent.html background-common-usage-ref.html
-random-if(bug685516) == background-common-usage-pixel.html background-common-usage-ref.html
-random-if(bug685516) == background-draw-nothing-empty-rect.html background-draw-nothing-ref.html
-random-if(bug685516) == background-draw-nothing-invalid-syntax.html background-draw-nothing-ref.html
-random-if(bug685516) asserts(0-4) == background-draw-nothing-malformed-images.html background-draw-nothing-ref.html # Bug 576419
-random-if(bug685516) == background-monster-rect.html background-monster-rect-ref.html
-random-if(bug685516) == background-over-size-rect.html background-over-size-rect-ref.html
-random-if(bug685516) == background-test-parser.html background-test-parser-ref.html
-random-if(bug685516) fuzzy-if(Android||B2G,113,124) == background-with-other-properties.html background-with-other-properties-ref.html
-random-if(bug685516) == background-zoom-1.html background-zoom-1-ref.html
-random-if(bug685516) == background-zoom-2.html background-zoom-2-ref.html
-random-if(bug685516) == background-zoom-3.html background-zoom-3-ref.html
-random-if(bug685516) == background-zoom-4.html background-zoom-4-ref.html
-random-if(bug685516) == dom-api-computed-style.html dom-api-ref.html
-random-if(bug685516) == dom-api.html dom-api-ref.html
+skip-if(B2G) == background-common-usage-floating-point.html background-common-usage-ref.html # bug 773482
+== background-common-usage-percent.html background-common-usage-ref.html
+== background-common-usage-pixel.html background-common-usage-ref.html
+== background-draw-nothing-empty-rect.html background-draw-nothing-ref.html
+== background-draw-nothing-invalid-syntax.html background-draw-nothing-ref.html
+asserts(0-4) == background-draw-nothing-malformed-images.html background-draw-nothing-ref.html # Bug 576419
+== background-monster-rect.html background-monster-rect-ref.html
+== background-over-size-rect.html background-over-size-rect-ref.html
+== background-test-parser.html background-test-parser-ref.html
+fuzzy-if(Android||B2G,113,124) == background-with-other-properties.html background-with-other-properties-ref.html
+== background-zoom-1.html background-zoom-1-ref.html
+== background-zoom-2.html background-zoom-2-ref.html
+== background-zoom-3.html background-zoom-3-ref.html
+== background-zoom-4.html background-zoom-4-ref.html
+== dom-api-computed-style.html dom-api-ref.html
+== dom-api.html dom-api-ref.html
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -1,9 +1,9 @@
-random-if(bug685516) fuzzy-if(Android,4,15) == background-image-zoom-1.html background-image-zoom-1-ref.html
+fuzzy-if(Android,4,15) == background-image-zoom-1.html background-image-zoom-1-ref.html
 == background-image-zoom-2.html about:blank
 == image-seam-1a.html image-seam-1-ref.html
 == image-seam-1b.html image-seam-1-ref.html
 fails-if(cocoaWidget) == image-seam-2.html image-seam-2-ref.html # Quartz doesn't support EXTEND_PAD (bug 567370)
 == image-zoom-1.html image-zoom-1-ref.html
 == image-zoom-2.html image-zoom-1-ref.html
 == invalid-url-image-1.html invalid-url-image-1-ref.html
 random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1a.html sync-image-switch-1-ref.html # bug 855050 for WinXP
--- a/layout/reftests/pixel-rounding/reftest.list
+++ b/layout/reftests/pixel-rounding/reftest.list
@@ -45,43 +45,43 @@
 == border-left-5.html border-left-10-ref.html
 == border-left-6.html border-left-10-ref.html
 != border-base-ref.html border-top-10-ref.html
 == border-top-4.html border-base-ref.html
 == border-top-5.html border-top-10-ref.html
 == border-top-6.html border-top-10-ref.html
 
 != background-image-base.html background-image-height-10-ref.html
-random-if(bug685516) == background-image-height-4.html background-image-base.html
-random-if(bug685516) == background-image-height-5.html background-image-height-10-ref.html
-random-if(bug685516) == background-image-height-6.html background-image-height-10-ref.html
+== background-image-height-4.html background-image-base.html
+== background-image-height-5.html background-image-height-10-ref.html
+== background-image-height-6.html background-image-height-10-ref.html
 != background-image-base.html background-image-top-10-ref.html
-random-if(bug685516) == background-image-top-4.html background-image-base.html
-random-if(bug685516) == background-image-top-5.html background-image-top-10-ref.html
-random-if(bug685516) == background-image-top-6.html background-image-top-10-ref.html
+== background-image-top-4.html background-image-base.html
+== background-image-top-5.html background-image-top-10-ref.html
+== background-image-top-6.html background-image-top-10-ref.html
 != background-image-base.html background-image-width-10-ref.html
-random-if(bug685516) == background-image-width-4.html background-image-base.html
-random-if(bug685516) == background-image-width-5.html background-image-width-10-ref.html
-random-if(bug685516) == background-image-width-6.html background-image-width-10-ref.html
+== background-image-width-4.html background-image-base.html
+== background-image-width-5.html background-image-width-10-ref.html
+== background-image-width-6.html background-image-width-10-ref.html
 != background-image-base.html background-image-left-10-ref.html
-random-if(bug685516) == background-image-left-4.html background-image-base.html
-random-if(bug685516) == background-image-left-5.html background-image-left-10-ref.html
-random-if(bug685516) == background-image-left-6.html background-image-left-10-ref.html
-random-if(bug685516) == background-image-top-height-4.html background-image-height-4.html
-random-if(bug685516) == background-image-top-height-5.html background-image-height-5.html
-random-if(bug685516) == background-image-top-height-6.html background-image-height-6.html
-random-if(bug685516) == background-image-left-width-4.html background-image-width-4.html
-random-if(bug685516) == background-image-left-width-5.html background-image-width-5.html
-random-if(bug685516) == background-image-left-width-6.html background-image-width-6.html
-random-if(bug685516) == background-image-height-top-4.html background-image-height-4.html
-random-if(bug685516) == background-image-height-top-5.html background-image-height-5.html
-random-if(bug685516) == background-image-height-top-6.html background-image-height-6.html
-random-if(bug685516) == background-image-width-left-4.html background-image-width-4.html
-random-if(bug685516) == background-image-width-left-5.html background-image-width-5.html
-random-if(bug685516) == background-image-width-left-6.html background-image-width-6.html
+== background-image-left-4.html background-image-base.html
+== background-image-left-5.html background-image-left-10-ref.html
+== background-image-left-6.html background-image-left-10-ref.html
+== background-image-top-height-4.html background-image-height-4.html
+== background-image-top-height-5.html background-image-height-5.html
+== background-image-top-height-6.html background-image-height-6.html
+== background-image-left-width-4.html background-image-width-4.html
+== background-image-left-width-5.html background-image-width-5.html
+== background-image-left-width-6.html background-image-width-6.html
+== background-image-height-top-4.html background-image-height-4.html
+== background-image-height-top-5.html background-image-height-5.html
+== background-image-height-top-6.html background-image-height-6.html
+== background-image-width-left-4.html background-image-width-4.html
+== background-image-width-left-5.html background-image-width-5.html
+== background-image-width-left-6.html background-image-width-6.html
 
 
 # These all fail due bug 371180, plus a bunch of other bugs that ought to be filed.
 fails == collapsed-border-height-4.html border-base-ref.html
 fails == collapsed-border-height-5.html border-height-10-ref.html
 fails == collapsed-border-height-6.html border-height-10-ref.html
 fails == collapsed-border-width-4.html border-base-ref.html
 fails == collapsed-border-width-5.html border-width-10-ref.html
@@ -162,15 +162,15 @@ fails == collapsed-border-top-6.html bor
 == rounded-background-color-left-width-6.html rounded-background-color-width-6.html
 == rounded-background-color-height-top-4.html rounded-background-color-height-4.html
 == rounded-background-color-height-top-5.html rounded-background-color-height-5.html
 == rounded-background-color-height-top-6.html rounded-background-color-height-6.html
 == rounded-background-color-width-left-4.html rounded-background-color-width-4.html
 == rounded-background-color-width-left-5.html rounded-background-color-width-5.html
 == rounded-background-color-width-left-6.html rounded-background-color-width-6.html
 
-skip-if(B2G) random-if(bug685516) fails-if(cocoaWidget) == background-image-tiling.html background-image-tiling-ref.html # probably bug 379317 # bug 773482
+skip-if(B2G) fails-if(cocoaWidget) == background-image-tiling.html background-image-tiling-ref.html # probably bug 379317 # bug 773482
 
 != border-image-width-0.html border-image-width-10.html
 skip-if(B2G) random-if(Android) == border-image-width-4.html border-image-width-0.html # bug 661996 # bug 773482
 skip-if(B2G) random-if(Android) == border-image-width-9.html border-image-width-0.html # bug 661996 # bug 773482
 
 == iframe-1.html iframe-1-ref.html
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -1,18 +1,18 @@
 HTTP == fixed-1.html fixed-1.html?ref
-random-if(bug685516) HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
-skip-if(B2G) random-if(bug685516) HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
-skip-if(B2G) random-if(gtk2Widget) random-if(bug685516) HTTP == fixed-text-1.html fixed-text-1.html?ref
-random-if(bug685516) HTTP == fixed-text-2.html fixed-text-2.html?ref
+HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
+skip-if(B2G) HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
+skip-if(B2G) random-if(gtk2Widget) HTTP == fixed-text-1.html fixed-text-1.html?ref
+HTTP == fixed-text-2.html fixed-text-2.html?ref
 random-if(Android&&!browserIsRemote) == iframe-border-radius.html iframe-border-radius-ref.html # bug 760269
 random-if(Android) HTTP == image-1.html image-1.html?ref
 random-if(Android&&!browserIsRemote) HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref # bug 760269
 skip-if(B2G) random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357
-random-if(bug685516) HTTP == simple-1.html simple-1.html?ref
+HTTP == simple-1.html simple-1.html?ref
 skip-if(B2G) HTTP == subpixel-1.html#d subpixel-1-ref.html#d
 fuzzy-if(Android,4,32) HTTP == text-1.html text-1.html?ref
 fuzzy-if(Android,4,5) HTTP == text-2.html?up text-2.html?ref
 fuzzy-if(Android,255,675) HTTP == transformed-1.html transformed-1.html?ref
 HTTP == transformed-1.html?up transformed-1.html?ref
 fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1-ref.html
 fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2-ref.html
 skip-if(B2G) == less-than-scrollbar-height.html less-than-scrollbar-height-ref.html
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -13,17 +13,17 @@ skip-if(B2G) == background-simple-1.html
 # background tests with the background area getting resized
 == background-resize-1.html  lime100x100-ref.html
 == background-resize-2.html  lime100x100-ref.html
 == background-resize-3.html  lime100x100-ref.html
 == background-resize-4.html  lime100x100-ref.html
 
 # Tests with -moz-image-rect()
 skip-if(B2G) == background-image-rect-1svg.html  lime100x100-ref.html # bug 773482
-random-if(bug685516) == background-image-rect-1png.html  lime100x100-ref.html
+== background-image-rect-1png.html  lime100x100-ref.html
 == background-image-rect-2.html     lime100x100-ref.html
 
 # Test for border-image
 == border-image-simple-1.html       lime100x100-ref.html
 == border-image-simple-2.html       lime100x100-ref.html
 
 # Test for canvas "drawImage" method
 # NOTE: The canvas reftests that involve scaling currently fail with fuzziness
--- a/layout/reftests/table-background/reftest.list
+++ b/layout/reftests/table-background/reftest.list
@@ -23,36 +23,36 @@ asserts-if(gtk2Widget,0-6) != backgr_bor
 != backgr_simple-table-column.html empty.html
 != backgr_simple-table-row-group.html empty.html
 != backgr_simple-table-row.html empty.html
 != backgr_simple-table.html empty.html
 
 # would also be good to test table-header-group and table-footer-group
 # (and rows and row groups in the presence of their reordering)
 # Also need to test different values of background-origin and background-clip.
-skip-if(B2G) random-if(bug685516) == border-separate-table-cell.html border-separate-table-cell-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-separate-table-column-group.html border-separate-table-column-group-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-separate-table-column.html border-separate-table-column-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-separate-table-row-group.html border-separate-table-row-group-ref.html # bug 773482
-random-if(bug685516) == border-separate-table-row.html border-separate-table-row-ref.html
-skip-if(B2G) random-if(bug685516) == border-separate-table.html border-separate-table-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-collapse-table-cell.html border-collapse-table-cell-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-collapse-table-column-group.html border-collapse-table-column-group-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-collapse-table-column.html border-collapse-table-column-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-collapse-table-row-group.html border-collapse-table-row-group-ref.html # bug 773482
-random-if(bug685516) == border-collapse-table-row.html border-collapse-table-row-ref.html
-random-if(bug685516) == border-collapse-table.html border-collapse-table-ref.html
-skip-if(B2G) random-if(bug685516) == border-collapse-opacity-table-cell.html border-collapse-opacity-table-cell-ref.html # bug 773482
+skip-if(B2G) == border-separate-table-cell.html border-separate-table-cell-ref.html # bug 773482
+skip-if(B2G) == border-separate-table-column-group.html border-separate-table-column-group-ref.html # bug 773482
+skip-if(B2G) == border-separate-table-column.html border-separate-table-column-ref.html # bug 773482
+skip-if(B2G) == border-separate-table-row-group.html border-separate-table-row-group-ref.html # bug 773482
+== border-separate-table-row.html border-separate-table-row-ref.html
+skip-if(B2G) == border-separate-table.html border-separate-table-ref.html # bug 773482
+skip-if(B2G) == border-collapse-table-cell.html border-collapse-table-cell-ref.html # bug 773482
+skip-if(B2G) == border-collapse-table-column-group.html border-collapse-table-column-group-ref.html # bug 773482
+skip-if(B2G) == border-collapse-table-column.html border-collapse-table-column-ref.html # bug 773482
+skip-if(B2G) == border-collapse-table-row-group.html border-collapse-table-row-group-ref.html # bug 773482
+== border-collapse-table-row.html border-collapse-table-row-ref.html
+== border-collapse-table.html border-collapse-table-ref.html
+skip-if(B2G) == border-collapse-opacity-table-cell.html border-collapse-opacity-table-cell-ref.html # bug 773482
 fails == border-collapse-opacity-table-column-group.html border-collapse-opacity-table-column-group-ref.html # bug 424274
 fails == border-collapse-opacity-table-column.html border-collapse-opacity-table-column-ref.html # bug 424274
-skip-if(B2G) random-if(bug685516) == border-collapse-opacity-table-row-group.html border-collapse-opacity-table-row-group-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-collapse-opacity-table-row.html border-collapse-opacity-table-row-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-collapse-opacity-table.html border-collapse-opacity-table-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-separate-opacity-table-cell.html border-separate-opacity-table-cell-ref.html # bug 773482
+skip-if(B2G) == border-collapse-opacity-table-row-group.html border-collapse-opacity-table-row-group-ref.html # bug 773482
+skip-if(B2G) == border-collapse-opacity-table-row.html border-collapse-opacity-table-row-ref.html # bug 773482
+skip-if(B2G) == border-collapse-opacity-table.html border-collapse-opacity-table-ref.html # bug 773482
+skip-if(B2G) == border-separate-opacity-table-cell.html border-separate-opacity-table-cell-ref.html # bug 773482
 fails == border-separate-opacity-table-column-group.html border-separate-opacity-table-column-group-ref.html # bug 424274
 fails == border-separate-opacity-table-column.html border-separate-opacity-table-column-ref.html # bug 424274
-random-if(bug685516) == border-separate-opacity-table-row-group.html border-separate-opacity-table-row-group-ref.html
-skip-if(B2G) random-if(bug685516) == border-separate-opacity-table-row.html border-separate-opacity-table-row-ref.html # bug 773482
-skip-if(B2G) random-if(bug685516) == border-separate-opacity-table.html border-separate-opacity-table-ref.html # bug 773482
+== border-separate-opacity-table-row-group.html border-separate-opacity-table-row-group-ref.html
+skip-if(B2G) == border-separate-opacity-table-row.html border-separate-opacity-table-row-ref.html # bug 773482
+skip-if(B2G) == border-separate-opacity-table.html border-separate-opacity-table-ref.html # bug 773482
 != scrollable-rowgroup-collapse-background.html scrollable-rowgroup-collapse-notref.html 
 != scrollable-rowgroup-collapse-border.html scrollable-rowgroup-collapse-notref.html     
 != scrollable-rowgroup-separate-background.html scrollable-rowgroup-separate-notref.html
 == scrollable-rowgroup-separate-border.html scrollable-rowgroup-separate-notref.html # scrolling rowgroups were removed in bug 28800
--- a/layout/reftests/w3c-css/submitted/values3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/values3/reftest.list
@@ -1,12 +1,12 @@
 == calc-background-linear-gradient-1.html calc-background-linear-gradient-1-ref.html
-random-if(bug685516) == calc-background-image-gradient-1.html calc-background-image-gradient-1-ref.html
-random-if(bug685516) == calc-background-position-1.html calc-background-position-1-ref.html
-random-if(bug685516) == calc-background-size-1.html calc-background-size-1-ref.html
+== calc-background-image-gradient-1.html calc-background-image-gradient-1-ref.html
+== calc-background-position-1.html calc-background-position-1-ref.html
+== calc-background-size-1.html calc-background-size-1-ref.html
 == calc-border-radius-1.html calc-border-radius-1-ref.html
 == calc-height-block-1.html calc-height-block-1-ref.html
 skip-if(B2G) == calc-height-table-1.html calc-height-table-1-ref.html
 == calc-margin-block-1.html calc-margin-block-1-ref.html
 == calc-max-height-block-1.html calc-max-height-block-1-ref.html
 == calc-max-width-block-1.html calc-width-block-1-ref.html
 == calc-max-width-block-intrinsic-1.html calc-max-width-block-intrinsic-1-ref.html
 == calc-min-height-block-1.html calc-height-block-1-ref.html
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -670,17 +670,16 @@ function BuildConditionSandbox(aURL) {
         }
 
         return testPluginIsOOP;
     };
 
     // Tests shouldn't care about this except for when they need to
     // crash the content process
     sandbox.browserIsRemote = gBrowserIsRemote;
-    sandbox.bug685516 = sandbox.browserIsRemote && sandbox.Android;
 
     // Distinguish the Fennecs:
     sandbox.xulFennec    = sandbox.Android &&  sandbox.browserIsRemote;
     sandbox.nativeFennec = sandbox.Android && !sandbox.browserIsRemote;
 
     if (!gDumpedConditionSandbox) {
         dump("REFTEST INFO | Dumping JSON representation of sandbox \n");
         dump("REFTEST INFO | " + JSON.stringify(sandbox) + " \n");