From 72b944d0f09fd03cbace55fdcb727d662353e0c0 Mon Sep 17 00:00:00 2001 From: Jamie Nicol Date: Wed, 14 Oct 2015 11:32:55 +0530 Subject: [PATCH] Bug 1209801 - Part 3: Adjust reftest fuzz and expected fails. r=mattwoodrow Due to parts 1 and 2 the fuzz factor on a test needed to be slightly increased, and several tests which were failing now pass. --- layout/reftests/backgrounds/reftest.list | 12 ++++++------ layout/reftests/border-radius/reftest.list | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list index da9c07b788e..922a881a2f7 100644 --- a/layout/reftests/backgrounds/reftest.list +++ b/layout/reftests/backgrounds/reftest.list @@ -148,17 +148,17 @@ HTTP == background-referrer.html background-referrer-ref.html == attachment-local-clipping-color-1.html attachment-local-clipping-color-1-ref.html == attachment-local-clipping-color-2.html attachment-local-clipping-color-1-ref.html # Same ref as the previous test. == attachment-local-clipping-color-3.html attachment-local-clipping-color-3-ref.html -fails-if(Android&&AndroidVersion==15) == attachment-local-clipping-color-4.html attachment-local-clipping-color-4-ref.html #Bug 959165 -fails-if(Android&&AndroidVersion==15) == attachment-local-clipping-color-5.html attachment-local-clipping-color-4-ref.html # Same ref as the previous test. #Bug 959165 -fails-if(Android&&AndroidVersion==15) fuzzy-if(!Android||(Android&&AndroidVersion!=15),50,500) == attachment-local-clipping-color-6.html attachment-local-clipping-color-6-ref.html #Bug 959165 +== attachment-local-clipping-color-4.html attachment-local-clipping-color-4-ref.html +== attachment-local-clipping-color-5.html attachment-local-clipping-color-4-ref.html +fuzzy(50,500) == attachment-local-clipping-color-6.html attachment-local-clipping-color-6-ref.html == attachment-local-clipping-image-1.html attachment-local-clipping-image-1-ref.html == attachment-local-clipping-image-2.html attachment-local-clipping-image-1-ref.html # Same ref as the previous test. == attachment-local-clipping-image-3.html attachment-local-clipping-image-3-ref.html # The next three tests are fuzzy due to bug 1128229. -fails-if(Android&&AndroidVersion==15) fuzzy-if(winWidget||(Android&&AndroidVersion!=15),16,69) == attachment-local-clipping-image-4.html attachment-local-clipping-image-4-ref.html #Bug 959165 -fails-if(Android&&AndroidVersion==15) fuzzy-if(winWidget||(Android&&AndroidVersion!=15),16,69) == attachment-local-clipping-image-5.html attachment-local-clipping-image-4-ref.html # Same ref as the previous test. #Bug 959165 -fails-if(Android&&AndroidVersion==15) fuzzy-if(!Android||(Android&&AndroidVersion!=15),80,500) == attachment-local-clipping-image-6.html attachment-local-clipping-image-6-ref.html #Bug 959165 +fuzzy(16,69) == attachment-local-clipping-image-4.html attachment-local-clipping-image-4-ref.html +fuzzy(16,69) == attachment-local-clipping-image-5.html attachment-local-clipping-image-4-ref.html +fuzzy(80,500) == attachment-local-clipping-image-6.html attachment-local-clipping-image-6-ref.html == background-multiple-with-border-radius.html background-multiple-with-border-radius-ref.html == background-repeat-large-area.html background-repeat-large-area-ref.html diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list index 11e6fa571af..76beabc1f86 100644 --- a/layout/reftests/border-radius/reftest.list +++ b/layout/reftests/border-radius/reftest.list @@ -51,7 +51,7 @@ fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-5-image.html fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-5-overflow-hidden.html clipping-5-ref.html fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,5,21) == clipping-5-refi.html clipping-5-ref.html fuzzy-if(true,1,7) fuzzy-if(cocoaWidget,1,99) fuzzy-if(Android&&browserIsRemote,7,89) fuzzy-if(Android&&!browserIsRemote,99,115) == clipping-5-refc.html clipping-5-ref.html # bug 732535 -fuzzy-if(winWidget,105,71) fuzzy-if(Android,8,464) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical +fuzzy-if(winWidget,105,71) fuzzy-if(Android,8,469) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical fuzzy-if(true,2,29) fuzzy-if(Android&&AndroidVersion<15,12,81) fuzzy-if(Android&&AndroidVersion>=15,255,586) == clipping-7.html clipping-7-ref.html # ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures). fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-and-zindex-1.html clipping-and-zindex-1-ref.html fuzzy-if(cocoaWidget,1,4) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html