From 5fe6ffd64bf95e918a95b7b60dd090b66d575926 Mon Sep 17 00:00:00 2001 From: Dan Glastonbury Date: Wed, 30 May 2018 14:12:08 +1000 Subject: [PATCH] Bug 1457353 - P3: Disable failing SMIL tests. r=hiro,xidorn Disable failing SMIL tests for lighting-color with currentcolor until StyleComplexColor is extended to support addition. MozReview-Commit-ID: 6tbDYPFI9ey --HG-- extra : rebase_source : a8f1e363bd37c40ae2e48ef682a005aafaa27fe5 --- dom/smil/test/db_smilCSSFromBy.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dom/smil/test/db_smilCSSFromBy.js b/dom/smil/test/db_smilCSSFromBy.js index 6f68e0dfdaf7..2149b27d946e 100644 --- a/dom/smil/test/db_smilCSSFromBy.js +++ b/dom/smil/test/db_smilCSSFromBy.js @@ -44,6 +44,18 @@ var _fromByTestLists = { midComp: "rgba(225, 225, 225, 0.8)", toComp: "rgb(255, 255, 255)"}), ], + // Bug 1457353: Change from nsColor to StyleComplexColor causes addition + // with currentcolor to break. Bug 1465307 for work to re-enable. + colorNoCurrentColor: [ + new AnimTestcaseFromBy("rgba(10, 20, 30, 0.2)", "rgba(50, 50, 50, 1)", + // (rgb(10, 20, 30) * 0.2 * 0.5 + rgb(52, 54, 56) * 1.0 * 0.5) * (1 / 0.6) + { midComp: "rgba(45, 48, 52, 0.6)", + // (rgb(10, 20, 30) * 0.2 + rgb(50, 50, 50) * 1) / 1.0 + toComp: "rgb(52, 54, 56)"}), + new AnimTestcaseFromBy("rgba(100, 100, 100, 0.6)", "rgba(240, 240, 240, 1)", + { midComp: "rgba(225, 225, 225, 0.8)", + toComp: "rgb(255, 255, 255)"}), + ], lengthNoUnits: [ new AnimTestcaseFromBy("0", "50", { fromComp: "0px", // 0 acts like 0px midComp: "25px", @@ -132,7 +144,9 @@ var gFromByBundles = new AnimTestcaseFromBy("none", "0.1"), new AnimTestcaseFromBy("0.1", "none") ]), - new TestcaseBundle(gPropList.lighting_color, _fromByTestLists.color), + // Bug 1457353: Change from nsColor to StyleComplexColor causes addition + // with currentcolor to break. Bug 1465307 for work to re-enable. + new TestcaseBundle(gPropList.lighting_color, _fromByTestLists.colorNoCurrentColor), new TestcaseBundle(gPropList.marker, _fromByTestLists.URIsAndNone), new TestcaseBundle(gPropList.marker_end, _fromByTestLists.URIsAndNone), new TestcaseBundle(gPropList.marker_mid, _fromByTestLists.URIsAndNone),