Update CSS tests to revision d674587d6ae7d2e231d632785559f2613d554eb0

tests/wpt/css-tests/css21_dev/xhtml1print/reference/support/.htaccess

@@ -2,6 +2,42 @@
 AddCharset Shift_JIS .css
 </Files>
 
+<Files ~ "^plaintext.css$">
+ForceType text/plain
+</Files>
+
+<files character-encoding-031.css>
+AddCharset iso-8859-1 .css
+</files>
+
+<files character-encoding-032.css>
+AddCharset iso-8859-11 .css
+</files>
+
+<files character-encoding-033.css>
+AddCharset iso-8859-5 .css
+</files>
+
+<files character-encoding-034.css>
+AddCharset iso-8859-6 .css
+</files>
+
+<files character-encoding-035.css>
+AddCharset iso-8859-7 .css
+</files>
+
+<files character-encoding-036.css>
+AddCharset iso-8859-8 .css
+</files>
+
+<files character-encoding-037.css>
+AddCharset koi8-r .css
+</files>
+
+<files ~ '^at-charset-07[1234567]\.css$'>
+RemoveCharset .css
+</files>
+
 <Files "http1.css">
 AddCharset iso-8859-1 .css
 </Files>
@@ -45,42 +81,6 @@ AddCharset iso-8859-1 .css
 AddCharset iso-8859-1 .css
 </Files>
 
-<Files ~ "^plaintext.css$">
-ForceType text/plain
-</Files>
-
-<files character-encoding-031.css>
-AddCharset iso-8859-1 .css
-</files>
-
-<files character-encoding-032.css>
-AddCharset iso-8859-11 .css
-</files>
-
-<files character-encoding-033.css>
-AddCharset iso-8859-5 .css
-</files>
-
-<files character-encoding-034.css>
-AddCharset iso-8859-6 .css
-</files>
-
-<files character-encoding-035.css>
-AddCharset iso-8859-7 .css
-</files>
-
-<files character-encoding-036.css>
-AddCharset iso-8859-8 .css
-</files>
-
-<files character-encoding-037.css>
-AddCharset koi8-r .css
-</files>
-
-<files ~ '^at-charset-07[1234567]\.css$'>
-RemoveCharset .css
-</files>
-
 <Files ~ "^at-charset-00[1-6].css$">
 AddCharset Shift_JIS .css
 </Files>

tests/wpt/css-tests/css21_dev/xhtml1print/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);
+})(window);

tests/wpt/css-tests/css21_dev/xhtml1print/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);
+})(window);

tests/wpt/css-tests/css21_dev/xhtml1print/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'],

tests/wpt/css-tests/css21_dev/xhtml1print/reference/support/text-orientation.js

@@ -1,4 +1,6 @@
 (function () {
+    var log = function () {};
+
     function OrientationTester(container, orientation) {
         this.container = container;
         this.setOrientation(orientation);
@@ -212,8 +214,4 @@
         for (var key in dict)
             target[key] = dict[key];
     }
-
-    function log(text) {
-        console.log(text);
-    }
 })();