aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2015-08-21 17:46:44 +0200
committerMs2ger <Ms2ger@gmail.com>2015-08-21 18:40:37 +0200
commitf235d49372ba86d6d01530fe1b9ebdf8bea74468 (patch)
tree13d3535ee53fcae1b8d61265e3d97adb00dd60eb /tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js
parent7c45ff8e05a6ebd21f9aa5c360e997a01d48b1fc (diff)
downloadservo-f235d49372ba86d6d01530fe1b9ebdf8bea74468.tar.gz
servo-f235d49372ba86d6d01530fe1b9ebdf8bea74468.zip
Update CSS tests to revision d674587d6ae7d2e231d632785559f2613d554eb0
Diffstat (limited to 'tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js')
-rw-r--r--tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js b/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js
index c7853c3e65f..1a4bf343df0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/generalParallelTest.js
@@ -49,13 +49,15 @@ var suite = root.generalParallelTest = {
// bind TransitionEnd event listeners
_setupEvents: function(data, options) {
['transition', 'container'].forEach(function(elem) {
- data[elem]._events = addTransitionEvent(data[elem].node, function(event) {
+ var handler = function(event) {
event.stopPropagation();
var name = event.propertyName;
var time = Math.round(event.elapsedTime * 1000) / 1000;
var pseudo = event.pseudoElement ? (':' + event.pseudoElement) : '';
data[elem].events.push(name + pseudo + ":" + time + "s");
- });
+ };
+ data[elem].node.addEventListener('transitionend', handler, false);
+ data[elem]._events = {'transitionend': handler};
});
},
// cleanup after individual test
@@ -152,7 +154,7 @@ var suite = root.generalParallelTest = {
},
// requestAnimationFrame runLoop to collect computed values
startValueCollection: function(options) {
- var raf = getRequestAnimationFrame() || function(callback){
+ var raf = window.requestAnimationFrame || function(callback){
setTimeout(callback, 20);
};
@@ -226,4 +228,4 @@ var suite = root.generalParallelTest = {
}
};
-})(window); \ No newline at end of file
+})(window);