Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 15 Aug 2012 21:00:42 -0400
changeset 102492 2d89567b206bc026c5190ddbfc4bb93d28dcfdc3
parent 102491 ac8287aea1fbc951caecd3a6e9103d3c31265b44 (current diff)
parent 102406 996a68d8420ee36b459933a3e27853d4810e6b39 (diff)
child 102493 e79bf6f458f74c4352babb58bb8b9408a48aa8a6
push id23288
push useremorley@mozilla.com
push dateThu, 16 Aug 2012 13:14:48 +0000
treeherdermozilla-central@3940df6f9356 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound.
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -122,11 +122,11 @@ fails == background-size-zoom-repeat.htm
 # -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) == 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
 HTTP != root-background-1.html about:blank
 
-== really-big-background.html really-big-background-ref.html
+random-if(bug685516) == really-big-background.html really-big-background-ref.html
 
 random-if(bug685516) == background-repeat-1-ref.html background-repeat-1.html
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -2,17 +2,17 @@ HTTP == fixed-1.html fixed-1.html?ref
 random-if(bug685516) HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
 random-if(bug685516) HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
 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
 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
 random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357
-HTTP == simple-1.html simple-1.html?ref
+random-if(bug685516) HTTP == simple-1.html simple-1.html?ref
 HTTP == subpixel-1.html#d subpixel-1-ref.html#d
 HTTP == text-1.html text-1.html?ref
 HTTP == text-2.html?up text-2.html?ref
 HTTP == transformed-1.html transformed-1.html?ref
 HTTP == transformed-1.html?up transformed-1.html?ref
 == uncovering-1.html uncovering-1-ref.html
 == uncovering-2.html uncovering-2-ref.html
 == less-than-scrollbar-height.html less-than-scrollbar-height-ref.html