Commit d50b2beb authored by timloh@chromium.org's avatar timloh@chromium.org

Remove "static:" element type from animation-test-helpers.js

Currently animation-test-helpers.js supports prefixing element ids with
"static:". This patch removes this prefix as we just just remove them
and do nothing differently.

Review URL: https://codereview.chromium.org/693613006

git-svn-id: svn://svn.chromium.org/blink/trunk@185147 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 27771088
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
const expectedValues = [ const expectedValues = [
// [time, element-id, property, expected-value, tolerance] // [time, element-id, property, expected-value, tolerance]
[2.5, "box", "backgroundImage", 0.5, 0.05], [2.5, "box", "backgroundImage", 0.5, 0.05],
[2.5, ["box", "static:boxStatic"], "backgroundImage", 0.5, 0.05], [2.5, ["box", "boxStatic"], "backgroundImage", 0.5, 0.05],
[2.5, ["boxShorthand", "static:boxStatic"], "backgroundImage", 0.5, 0.05], [2.5, ["boxShorthand", "boxStatic"], "backgroundImage", 0.5, 0.05],
]; ];
var doPixelTest = true; var doPixelTest = true;
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
// [time, element-id, property, expected-value, tolerance] // [time, element-id, property, expected-value, tolerance]
// FIXME: We can't test reading the borderImage shorthand because of bug #13658. // FIXME: We can't test reading the borderImage shorthand because of bug #13658.
[2.5, "box", "borderImageSource", 0.5, 0.05], [2.5, "box", "borderImageSource", 0.5, 0.05],
[2.5, ["box", "static:boxStatic"], "borderImageSource", 0.5, 0.05], [2.5, ["box", "boxStatic"], "borderImageSource", 0.5, 0.05],
[2.5, ["boxShorthand", "static:boxStatic"], "borderImageSource", 0.5, 0.05], [2.5, ["boxShorthand", "boxStatic"], "borderImageSource", 0.5, 0.05],
]; ];
var doPixelTest = true; var doPixelTest = true;
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
const expectedValues = [ const expectedValues = [
// [time, element-id, property, expected-value, tolerance] // [time, element-id, property, expected-value, tolerance]
[2.5, "box", "listStyleImage", 0.5, 0.05], [2.5, "box", "listStyleImage", 0.5, 0.05],
[2.5, ["box", "static:boxStatic"], "listStyleImage", 0.5, 0.05], [2.5, ["box", "boxStatic"], "listStyleImage", 0.5, 0.05],
[2.5, ["boxShorthand", "static:boxStatic"], "listStyleImage", 0.5, 0.05], [2.5, ["boxShorthand", "boxStatic"], "listStyleImage", 0.5, 0.05],
]; ];
var doPixelTest = true; var doPixelTest = true;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
const expectedValues = [ const expectedValues = [
// [time, element-id, property, expected-value, tolerance] // [time, element-id, property, expected-value, tolerance]
[2.25, "box", "webkitMaskBoxImage", 0.25, 0.05], [2.25, "box", "webkitMaskBoxImage", 0.25, 0.05],
[2.25, ["box", "static:boxStatic"], "webkitMaskBoxImage", 0.25, 0.05] [2.25, ["box", "boxStatic"], "webkitMaskBoxImage", 0.25, 0.05]
]; ];
var doPixelTest = true; var doPixelTest = true;
var disablePauseAPI = false; var disablePauseAPI = false;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
const expectedValues = [ const expectedValues = [
// [time, element-id, property, expected-value, tolerance] // [time, element-id, property, expected-value, tolerance]
[2.25, "box", "webkitMaskImage", 0.25, 0.05], [2.25, "box", "webkitMaskImage", 0.25, 0.05],
[2.25, ["box", "static:boxStatic"], "webkitMaskImage", 0.25, 0.05] [2.25, ["box", "boxStatic"], "webkitMaskImage", 0.25, 0.05]
]; ];
var doPixelTest = true; var doPixelTest = true;
......
...@@ -20,8 +20,7 @@ Function parameters: ...@@ -20,8 +20,7 @@ Function parameters:
[1] If a single string is passed, it is the id of the element to test. If an array with 2 elements is passed they [1] If a single string is passed, it is the id of the element to test. If an array with 2 elements is passed they
are the ids of 2 elements, whose values are compared for equality. In this case the expected value is ignored are the ids of 2 elements, whose values are compared for equality. In this case the expected value is ignored
but the tolerance is used in the comparison. If the second element is prefixed with "static:", no animation on that but the tolerance is used in the comparison.
element is required, allowing comparison with an unanimated "expected value" element.
If a string with a '.' is passed, this is an element in an iframe. The string before the dot is the iframe id If a string with a '.' is passed, this is an element in an iframe. The string before the dot is the iframe id
and the string after the dot is the element name in that iframe. and the string after the dot is the element name in that iframe.
...@@ -152,7 +151,6 @@ function checkExpectedValue(expected, index) ...@@ -152,7 +151,6 @@ function checkExpectedValue(expected, index)
// Check for a pair of element Ids // Check for a pair of element Ids
var compareElements = false; var compareElements = false;
var element2Static = false;
var elementId2; var elementId2;
if (typeof elementId != "string") { if (typeof elementId != "string") {
if (elementId.length != 2) if (elementId.length != 2)
...@@ -161,11 +159,6 @@ function checkExpectedValue(expected, index) ...@@ -161,11 +159,6 @@ function checkExpectedValue(expected, index)
elementId2 = elementId[1]; elementId2 = elementId[1];
elementId = elementId[0]; elementId = elementId[0];
if (elementId2.indexOf("static:") == 0) {
elementId2 = elementId2.replace("static:", "");
element2Static = true;
}
compareElements = true; compareElements = true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment