Index: third_party/WebKit/LayoutTests/typedcssom/cssTranslation.html |
diff --git a/third_party/WebKit/LayoutTests/typedcssom/cssTranslation.html b/third_party/WebKit/LayoutTests/typedcssom/cssTranslation.html |
index b971ddee72ef1316751d79f97ef6685bf055c5c8..de0f638480e5d4aa4f92e1ffb6d3ed4c45a69864 100644 |
--- a/third_party/WebKit/LayoutTests/typedcssom/cssTranslation.html |
+++ b/third_party/WebKit/LayoutTests/typedcssom/cssTranslation.html |
@@ -4,14 +4,14 @@ |
<script> |
-var simpleLength = new CSSSimpleLength(0, "px"); |
-var decimalLength = new CSSSimpleLength(1.1, "px"); |
-var negativeLength = new CSSSimpleLength(-2.2, "em"); |
-var calcLengthPx = new CSSCalcLength({px: 1}); |
-var calcLength = new CSSCalcLength({px: 1, em: -2.2}); |
+var simpleLength = new CSSUnitValue(0, "px"); |
+var decimalLength = new CSSUnitValue(1.1, "px"); |
+var negativeLength = new CSSUnitValue(-2.2, "em"); |
+// var calcLengthPx = new CSSCalcValue({px: 1}); |
+// var calcLength = new CSSCalcValue({px: 1, em: -2.2}); |
-var simplePercent = new CSSSimpleLength(10, "percent"); |
-var calcPercent = new CSSCalcLength({px: 1, percent: 2.2}); |
+var simplePercent = new CSSUnitValue(10, "percent"); |
+// var calcPercent = new CSSCalcValue({px: 1, percent: 2.2}); |
var values = [ |
// 2D CSSTranslation Transform Components |
@@ -19,36 +19,36 @@ var values = [ |
x: simpleLength, y: simpleLength, is2D: true}, |
{input: new CSSTranslation(decimalLength, negativeLength), |
x: decimalLength, y: negativeLength, is2D: true}, |
- {input: new CSSTranslation(negativeLength, calcLengthPx), |
- x: negativeLength, y: calcLengthPx, is2D: true}, |
- {input: new CSSTranslation(calcLengthPx, negativeLength), |
- x: calcLengthPx, y: negativeLength, is2D: true}, |
- {input: new CSSTranslation(calcLengthPx, calcLength), |
- x: calcLengthPx, y: calcLength, is2D: true}, |
+ // {input: new CSSTranslation(negativeLength, calcLengthPx), |
+ // x: negativeLength, y: calcLengthPx, is2D: true}, |
+ // {input: new CSSTranslation(calcLengthPx, negativeLength), |
+ // x: calcLengthPx, y: negativeLength, is2D: true}, |
+ // {input: new CSSTranslation(calcLengthPx, calcLength), |
+ // x: calcLengthPx, y: calcLength, is2D: true}, |
{input: new CSSTranslation(simplePercent, simpleLength), |
x: simplePercent, y: simpleLength, is2D: true}, |
- {input: new CSSTranslation(calcLengthPx, simplePercent), |
- x: calcLengthPx, y: simplePercent, is2D: true}, |
- {input: new CSSTranslation(calcPercent, calcLength), |
- x: calcPercent, y: calcLength, is2D: true}, |
- {input: new CSSTranslation(simplePercent, calcPercent), |
- x: simplePercent, y: calcPercent, is2D: true}, |
+ // {input: new CSSTranslation(calcLengthPx, simplePercent), |
+ // x: calcLengthPx, y: simplePercent, is2D: true}, |
+ // {input: new CSSTranslation(calcPercent, calcLength), |
+ // x: calcPercent, y: calcLength, is2D: true}, |
+ // {input: new CSSTranslation(simplePercent, calcPercent), |
+ // x: simplePercent, y: calcPercent, is2D: true}, |
// 3D CSSTranslation Transform Components |
{input: new CSSTranslation(simpleLength, simpleLength, simpleLength), |
x: simpleLength, y: simpleLength, z: simpleLength, is2D: false}, |
{input: new CSSTranslation(simpleLength, decimalLength, negativeLength), |
x: simpleLength, y: decimalLength, z: negativeLength, is2D: false}, |
- {input: new CSSTranslation(simpleLength, simpleLength, calcLengthPx), |
- x: simpleLength, y: simpleLength, z: calcLengthPx, is2D: false}, |
- {input: new CSSTranslation(calcLengthPx, calcLength, calcLength), |
- x: calcLengthPx, y: calcLength, z: calcLength, is2D: false}, |
+ // {input: new CSSTranslation(simpleLength, simpleLength, calcLengthPx), |
+ // x: simpleLength, y: simpleLength, z: calcLengthPx, is2D: false}, |
+ // {input: new CSSTranslation(calcLengthPx, calcLength, calcLength), |
+ // x: calcLengthPx, y: calcLength, z: calcLength, is2D: false}, |
{input: new CSSTranslation(simplePercent, decimalLength, simpleLength), |
x: simplePercent, y: decimalLength, z: simpleLength, is2D: false}, |
- {input: new CSSTranslation(simpleLength, calcPercent, decimalLength), |
- x: simpleLength, y: calcPercent, z: decimalLength, is2D: false}, |
- {input: new CSSTranslation(calcPercent, simplePercent, calcLength), |
- x: calcPercent, y: simplePercent, z: calcLength, is2D: false} |
+ // {input: new CSSTranslation(simpleLength, calcPercent, decimalLength), |
+ // x: simpleLength, y: calcPercent, z: decimalLength, is2D: false}, |
+ // {input: new CSSTranslation(calcPercent, simplePercent, calcLength), |
+ // x: calcPercent, y: simplePercent, z: calcLength, is2D: false} |
]; |
function expectedCssString(obj) { |
@@ -84,14 +84,14 @@ test(function() { |
}, "Test that toString values for CSSTranslation is correct."); |
test(function() { |
- assert_throws(null, function() { new CSSTranslation(simpleLength, simpleLength, simplePercent); }); |
- assert_throws(null, function() { new CSSTranslation(simpleLength, simpleLength, calcPercent); }); |
- assert_throws(null, function() { new CSSTranslation(simplePercent, simplePercent, simplePercent); }); |
+ assert_throws(new TypeError(), function() { new CSSTranslation(simpleLength, simpleLength, simplePercent); }); |
+ // assert_throws(null, function() { new CSSTranslation(simpleLength, simpleLength, calcPercent); }); |
+ assert_throws(new TypeError(), function() { new CSSTranslation(simplePercent, simplePercent, simplePercent); }); |
}, "Test that CSSTranslation constructor throws when z component contains percent."); |
test(function() { |
- assert_throws(null, function() { new CSSTranslation(); }); |
- assert_throws(null, function() { new CSSTranslation(simpleLength); }); |
+ assert_throws(new TypeError(), function() { new CSSTranslation(); }); |
+ assert_throws(new TypeError(), function() { new CSSTranslation(simpleLength); }); |
}, "Test that invalid number of arguments for CSSTranslation throws an exception."); |
</script> |