diff options
Diffstat (limited to 'tests/wpt/css-tests/css-transitions-1_dev/html/reference')
3 files changed, 9 insertions, 33 deletions
diff --git a/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/generalParallelTest.js b/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/generalParallelTest.js index c7853c3e65f..1a4bf343df0 100644 --- a/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/generalParallelTest.js +++ b/tests/wpt/css-tests/css-transitions-1_dev/html/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); diff --git a/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/helper.js b/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/helper.js index 642ee3435c9..242cd3ca635 100644 --- a/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/helper.js +++ b/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/helper.js @@ -62,22 +62,6 @@ root.reflow = function() { document.body.offsetWidth; }; -// add all known TransitionEnd events to element -root.addTransitionEvent = function(element, handler) { - return addEvent(element, 'TransitionEnd webkitTransitionEnd transitionend oTransitionEnd otransitionend MSTransitionEnd', handler); -}; - -// add space-separated list of events to element -root.addEvent = function(element, events, handler) { - var _events = {}; - var tokens = events.split(" "); - for (var i = 0, token; token = tokens[i]; i++) { - element.addEventListener(token, handler, false); - _events[token] = handler; - } - return _events; -}; - // merge objects root.extend = function(target /*, ..rest */) { Array.prototype.slice.call(arguments, 1).forEach(function(obj) { @@ -109,14 +93,4 @@ root.domFixture = function(selector) { throw new Error('domFixture must be initialized first!'); } }; - -// return requestAnimationFrame handler, if available -root.getRequestAnimationFrame = function() { - return window.requestAnimationFrame - || window.mozRequestAnimationFrame - || window.webkitRequestAnimationFrame - || window.msRequestAnimationFrame - || window.oRequestAnimationFrame; -}; - -})(window);
\ No newline at end of file +})(window); diff --git a/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/properties.js b/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/properties.js index 0ca8fedc05c..ddecfb6e336 100644 --- a/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/properties.js +++ b/tests/wpt/css-tests/css-transitions-1_dev/html/reference/support/properties.js @@ -210,7 +210,7 @@ var properties = { 'line-height': ['number', 'length', 'percentage'], 'letter-spacing': ['length'], // Note: percentage is Level3 and not implemented anywhere yet - // http://dev.w3.org/csswg/css3-text/#word-spacing + // https://drafts.csswg.org/css3-text/#word-spacing 'word-spacing': ['length', 'percentage'], 'text-indent': ['length', 'percentage'], 'text-shadow': ['shadow'], @@ -278,7 +278,7 @@ var unspecified_properties = { 'border-bottom-right-radius': ['border-radius'], 'background-image': ['image'], 'background-size': ['background-size'], - // http://dev.w3.org/csswg/css3-background/#the-box-shadow + // https://drafts.csswg.org/css3-background/#the-box-shadow // Animatable: yes, except between inner and outer shadows (Transition to/from an absent shadow is a transition to/from ‘0 0 transparent’ or ‘0 0 transparent inset’, as appropriate.) 'box-shadow': ['box-shadow'], 'font-size-adjust': ['number'], |