--- a/dom/smil/test/db_smilCSSFromBy.js
+++ b/dom/smil/test/db_smilCSSFromBy.js
@@ -39,16 +39,28 @@ var _fromByTestLists =
// midComp = (rgb(100, 100, 100) * 0.6 * 0.5 + rgb(300, 300, 300) * 1.0 * 0.5) * (1 / 0.8)
// = rgb(225, 225, 225)
//
//
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)"}),
],
+ // 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",
toComp: "50px"}),
new AnimTestcaseFromBy("30", "10", { fromComp: "30px",
midComp: "35px",
toComp: "40px"}),
],
@@ -127,17 +139,19 @@ var gFromByBundles =
_fromByTestLists.lengthPx)),
new TestcaseBundle(gPropList.font_size_adjust, [
// These testcases implicitly have no effect, because font-size-adjust is
// non-additive (and is declared as such in db_smilCSSPropertyList.js)
new AnimTestcaseFromBy("0.5", "0.1"),
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),
new TestcaseBundle(gPropList.marker_start, _fromByTestLists.URIsAndNone),
new TestcaseBundle(gPropList.overflow, [
new AnimTestcaseFromBy("inherit", "auto"),
new AnimTestcaseFromBy("scroll", "hidden")
]),