Index: LayoutTests/svg/dom/SVGTransformList-basics.xhtml |
diff --git a/LayoutTests/svg/dom/SVGTransformList-basics.xhtml b/LayoutTests/svg/dom/SVGTransformList-basics.xhtml |
index 87457edaeb1396c8754b3fb7fc090d082c74b275..45d3330a29f5499457ae265f759e4127f051e57a 100644 |
--- a/LayoutTests/svg/dom/SVGTransformList-basics.xhtml |
+++ b/LayoutTests/svg/dom/SVGTransformList-basics.xhtml |
@@ -2,6 +2,7 @@ |
<head> |
<script>window.enablePixelTesting = true;</script> |
<script src="../../resources/js-test.js"></script> |
+<script src="resources/SVGTransformList-helper.js"></script> |
</head> |
<body> |
<svg id="svg" xmlns="http://www.w3.org/2000/svg" width="200" height="200"> |
@@ -17,30 +18,6 @@ |
if (window.testRunner) |
testRunner.dumpAsText(); |
- function dumpMatrix(matrix) { |
- return "[" + matrix.a.toFixed(1) |
- + " " + matrix.b.toFixed(1) |
- + " " + matrix.c.toFixed(1) |
- + " " + matrix.d.toFixed(1) |
- + " " + matrix.e.toFixed(1) |
- + " " + matrix.f.toFixed(1) |
- + "]"; |
- } |
- |
- function dumpTransform(transform) { |
- var transformTypes = { |
- "0": "SVG_TRANSFORM_UNKNOWN", |
- "1": "SVG_TRANSFORM_MATRIX", |
- "2": "SVG_TRANSFORM_TRANSLATE", |
- "3": "SVG_TRANSFORM_SCALE", |
- "4": "SVG_TRANSFORM_ROTATE", |
- "5": "SVG_TRANSFORM_SKEWX", |
- "6": "SVG_TRANSFORM_SKEWY" |
- }; |
- |
- return "type=" + transformTypes[transform.type] + " matrix=" + dumpMatrix(transform.matrix); |
- } |
- |
var svg = document.getElementById("svg"); |
var circle1 = document.getElementById("circle1"); |
@@ -74,28 +51,38 @@ |
shouldThrow("circle1.transform.baseVal.insertItemBefore(null)"); |
shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), 'aString')", "circle1.transform.baseVal.getItem(0)"); |
- shouldBe("circle1.transform.baseVal.numberOfItems", "2"); |
+ shouldBe("circle1.transform.baseVal.numberOfItems", "3"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(1))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
- shouldBeEqualToString("circle1.getAttribute('transform')", "translate(10 10) scale(2 2)"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(2))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
+ shouldBeEqualToString("circle1.getAttribute('transform')", "translate(10 10) scale(2 2) translate(10 10)"); |
shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), circle1)", "circle1.transform.baseVal.getItem(0)"); |
- shouldBe("circle1.transform.baseVal.numberOfItems", "2"); |
+ shouldBe("circle1.transform.baseVal.numberOfItems", "4"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(1))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
- shouldBeEqualToString("circle1.getAttribute('transform')", "scale(2 2) translate(10 10)"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(2))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(3))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
+ shouldBeEqualToString("circle1.getAttribute('transform')", "scale(2 2) translate(10 10) scale(2 2) translate(10 10)"); |
shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), null)", "circle1.transform.baseVal.getItem(0)"); |
- shouldBe("circle1.transform.baseVal.numberOfItems", "2"); |
+ shouldBe("circle1.transform.baseVal.numberOfItems", "5"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(1))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
- shouldBeEqualToString("circle1.getAttribute('transform')", "translate(10 10) scale(2 2)"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(2))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(3))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(4))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
+ shouldBeEqualToString("circle1.getAttribute('transform')", "translate(10 10) scale(2 2) translate(10 10) scale(2 2) translate(10 10)"); |
shouldBe("circle1.transform.baseVal.insertItemBefore(circle1.transform.baseVal.getItem(1), 0)", "circle1.transform.baseVal.getItem(0)"); |
- shouldBe("circle1.transform.baseVal.numberOfItems", "2"); |
+ shouldBe("circle1.transform.baseVal.numberOfItems", "6"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(0))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(1))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
- shouldBeEqualToString("circle1.getAttribute('transform')", "scale(2 2) translate(10 10)"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(2))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(3))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(4))", "type=SVG_TRANSFORM_SCALE matrix=[2.0 0.0 0.0 2.0 0.0 0.0]"); |
+ shouldBeEqualToString("dumpTransform(circle1.transform.baseVal.getItem(5))", "type=SVG_TRANSFORM_TRANSLATE matrix=[1.0 0.0 0.0 1.0 10.0 10.0]"); |
+ shouldBeEqualToString("circle1.getAttribute('transform')", "scale(2 2) translate(10 10) scale(2 2) translate(10 10) scale(2 2) translate(10 10)"); |
shouldThrow("circle1.transform.baseVal.insertItemBefore(30, 0)"); |
shouldThrow("circle1.transform.baseVal.insertItemBefore('aString', 0)"); |