From 54897f1c6a2706ede494bba0fbc0ce85ca625ddd Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Fri, 18 Dec 2015 13:53:26 -0500 Subject: [PATCH] Bug 1082598 - Part 9: Fix test failures for Skia update. r=jrmuizel --- dom/canvas/test/test_canvas.html | 13 ++----------- layout/reftests/canvas/reftest.list | 2 +- layout/reftests/css-gradients/reftest.list | 2 +- layout/reftests/writing-mode/reftest.list | 6 +++--- .../2d.path.arcTo.shape.curve1.html.ini | 9 --------- .../2d.path.arcTo.shape.curve2.html.ini | 9 --------- .../path-objects/2d.path.stroke.prune.arc.html.ini | 3 +++ .../2d.path.stroke.prune.curve.html.ini | 3 +++ .../path-objects/2d.path.stroke.prune.line.html.ini | 3 +++ 9 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini delete mode 100644 testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini diff --git a/dom/canvas/test/test_canvas.html b/dom/canvas/test/test_canvas.html index a84a54d661f3..a8b67b3e2097 100644 --- a/dom/canvas/test/test_canvas.html +++ b/dom/canvas/test/test_canvas.html @@ -14401,12 +14401,7 @@ ctx.moveTo(50, 25); ctx.bezierCurveTo(50, 25, 50, 25, 50, 25); ctx.stroke(); -if (IsAzureSkia()) { - isPixel(ctx, 50,25, 0,255,0,255, 0); -} else { - todo_isPixel(ctx, 50,25, 0,255,0,255, 0); -} - +todo_isPixel(ctx, 50,25, 0,255,0,255, 0); } @@ -14438,11 +14433,7 @@ ctx.moveTo(50, 25); ctx.lineTo(50, 25); ctx.stroke(); -if (IsAzureSkia()) { - isPixel(ctx, 50,25, 0,255,0,255, 0); -} else { - todo_isPixel(ctx, 50,25, 0,255,0,255, 0); -} +todo_isPixel(ctx, 50,25, 0,255,0,255, 0); } diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list index 62c3ada7149b..74f438a09db2 100644 --- a/layout/reftests/canvas/reftest.list +++ b/layout/reftests/canvas/reftest.list @@ -94,7 +94,7 @@ fails-if(azureQuartz&&OSX==1006) == 672646-alpha-radial-gradient.html 672646-alp == 726951-shadow-clips.html 726951-shadow-clips-ref.html == transformed-clip.html transformed-clip-ref.html -== transformed-gradient.html transformed-gradient-ref.html +fuzzy-if(azureSkia,1,15) == transformed-gradient.html transformed-gradient-ref.html == transformed-path.html transformed-path.html == 749467-1.html 749467-1-ref.html diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list index 19c45747ea7b..1d8629e2c1d5 100644 --- a/layout/reftests/css-gradients/reftest.list +++ b/layout/reftests/css-gradients/reftest.list @@ -130,7 +130,7 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,2,19999) fuzzy-if(azureSkiaGL,8,20000) f fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4a.html aja-linear-4-ref.html fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4b.html aja-linear-4-ref.html fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,2,7878) == aja-linear-5a.html aja-linear-5-ref.html -fuzzy-if(!contentSameGfxBackendAsCanvas,2,16477) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 +fuzzy-if(!contentSameGfxBackendAsCanvas,2,16500) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 fails == aja-linear-6b.html aja-linear-6-ref.html # bug 522607 skip-if(B2G||Mulet) fuzzy-if(Android,6,10576) == height-dependence-1.html height-dependence-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,1,40000) fuzzy-if(Android,6,10576) == height-dependence-2.html height-dependence-2-ref.html # Initial mulet triage: parity with B2G/B2G Desktop diff --git a/layout/reftests/writing-mode/reftest.list b/layout/reftests/writing-mode/reftest.list index 61a533bc1e3e..05464d7ae4cd 100644 --- a/layout/reftests/writing-mode/reftest.list +++ b/layout/reftests/writing-mode/reftest.list @@ -16,10 +16,10 @@ fuzzy-if(gtkWidget,255,2) fuzzy-if(winWidget||Android||B2G,4,8704) HTTP(..) == 1 == 1089388-2.html 1089388-2-ref.html == 1090159-1.html 1090159-1-ref.html # bug 1230357 fuzz on b2g for subpixel text positioning on skia. -fuzzy-if(B2G&&azureSkia,128,166) == 1090168-1.html 1090168-1-ref.html +fuzzy-if(B2G&&azureSkia,130,200) == 1090168-1.html 1090168-1-ref.html != 1090168-1.html 1090168-1-notref.html -fuzzy-if(B2G&&azureSkia,128,166) == 1090168-2.html 1090168-2-ref.html -fuzzy-if(B2G,244,173) fuzzy-if(Mulet,255,165) fuzzy-if(azureSkia,255,2649) == 1090168-3.html 1090168-3-ref.html # bug 1142928: mark fuzzy on Mulet as on B2G, bug 1230357 for skia. +fuzzy-if(B2G&&azureSkia,130,200) == 1090168-2.html 1090168-2-ref.html +fuzzy-if(B2G,244,173) fuzzy-if(Mulet,255,165) fuzzy-if(azureSkia,255,2700) == 1090168-3.html 1090168-3-ref.html # bug 1142928: mark fuzzy on Mulet as on B2G, bug 1230357 for skia. == 1091058-1.html 1091058-1-ref.html random-if(gtkWidget) == 1094434-1.html 1094434-1-ref.html # bug 1094845 random-if(gtkWidget) == 1094434-2.html 1094434-2-ref.html # bug 1094845 diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini deleted file mode 100644 index f93da15c73a4..000000000000 --- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[2d.path.arcTo.shape.curve1.html] - type: testharness - [arcTo() curves in the right kind of shape] - expected: - if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL - if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL - if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL - if os == "mac": FAIL - diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini deleted file mode 100644 index 95953d2800d0..000000000000 --- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[2d.path.arcTo.shape.curve2.html] - type: testharness - [arcTo() curves in the right kind of shape] - expected: - if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL - if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL - if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL - if os == "mac": FAIL - diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini index 897bedd03f51..bbb5469d2340 100644 --- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini +++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini @@ -10,4 +10,7 @@ if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL + if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL + if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL + if os == "mac": FAIL diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini index bff057ced1d0..44de284abc2a 100644 --- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini +++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini @@ -10,4 +10,7 @@ if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL + if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL + if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL + if os == "mac": FAIL diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini index 1168046348fe..7447828f10ce 100644 --- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini +++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini @@ -10,4 +10,7 @@ if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL + if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL + if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL + if os == "mac": FAIL