Backed out changeset 140d33b3fbe2 (bug 1355732)

testing/web-platform/meta/MANIFEST.json

@@ -203005,7 +203005,7 @@
    "testharness"
   ],
   "service-workers/service-worker/update-bytecheck.https.html": [
-   "6562348b198124822297c6b622c3e63870427672",
+   "79b4a278f0e35646cfdffeebf8f0523e2772bc9b",
    "testharness"
   ],
   "service-workers/service-worker/update-recovery.https.html": [
@@ -207649,11 +207649,11 @@
    "testharness"
   ],
   "web-animations/animation-model/animation-types/property-list.js": [
-   "3d7b22ebf950652c8f806fff6aef68685a67ed5d",
+   "4fa529fe470abb7a6fb4582d0174f1696b141f87",
    "support"
   ],
   "web-animations/animation-model/animation-types/property-types.js": [
-   "38bdeff00d21201dc65c8e0fd8a337093ab807e5",
+   "7b79c51f6dc5c33aae127406509770159815c290",
    "support"
   ],
   "web-animations/animation-model/animation-types/spacing-keyframes-filters.html": [

testing/web-platform/meta/web-animations/animation-model/animation-types/addition-per-property.html.ini

@@ -1,6 +0,0 @@
-prefs: [layout.css.contain.enabled:true, layout.css.initial-letter.enabled:true, layout.css.overflow-clip-box.enabled:true, layout.css.shape-outside.enabled:true]
-[addition-per-property.html]
-  type: testharness
-  [column-gap: "normal" onto "200px"]
-    expected: FAIL
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1356241

testing/web-platform/meta/web-animations/animation-model/animation-types/interpolation-per-property.html.ini

@@ -35,14 +35,3 @@ prefs: [layout.css.contain.enabled:true, layout.css.initial-letter.enabled:true,
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1291187
 
-  [column-gap uses discrete animation when animating between "normal" and "200px" with linear easing]
-    expected: FAIL
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1356241
-
-  [column-gap uses discrete animation when animating between "normal" and "200px" with effect easing]
-    expected: FAIL
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1356241
-
-  [column-gap uses discrete animation when animating between "normal" and "200px" with keyframe easing]
-    expected: FAIL
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1356241

testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js

@@ -364,15 +364,12 @@ var gCSSProperties = {
   },
   'column-count': {
     // https://drafts.csswg.org/css-multicol/#propdef-column-count
-    types: [ 'positiveInteger',
+    types: [
-            { type: 'discrete', options: [ [ 'auto', '10' ] ] }
     ]
   },
   'column-gap': {
     // https://drafts.csswg.org/css-multicol/#propdef-column-gap
-    types: [ 'length',
+    types: [ 'length' ]
-	     {  type: 'discrete', options: [ [ 'normal', '200px' ] ] }
-    ]
   },
   'column-rule-color': {
     // https://drafts.csswg.org/css-multicol/#propdef-column-rule-color
@@ -1521,6 +1518,7 @@ function propertyToIDL(property) {
                           function (str) {
                             return str.substr(1).toUpperCase(); });
 }
+
 function calcFromPercentage(idlName, percentageValue) {
   var examElem = document.createElement('div');
   document.body.appendChild(examElem);

testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js

@@ -179,34 +179,6 @@ const integerType = {
 
 };
 
-const positiveIntegerType = {
-  testInterpolation: function(property, setup) {
-    test(function(t) {
-      var idlName = propertyToIDL(property);
-      var target = createTestElement(t, setup);
-      var animation = target.animate({ [idlName]: [1, 3] },
-                                     { duration: 1000, fill: 'both' });
-      testAnimationSamples(animation, idlName,
-                           [{ time: 0,    expected: '1' },
-                            { time: 500,  expected: '2' },
-                            { time: 1000, expected: '3' }]);
-    }, property + ' supports animating as a positive integer');
-  },
-
-  testAddition: function(property, setup) {
-    test(function(t) {
-      var idlName = propertyToIDL(property);
-      var target = createTestElement(t, setup);
-      target.style[idlName] = 1;
-      var animation = target.animate({ [idlName]: [2, 5] },
-                                     { duration: 1000, composite: 'add' });
-      testAnimationSamples(animation, idlName,
-                           [{ time: 0,    expected: '3' }]);
-    }, property + ': positive integer');
-  },
-
-};
-
 const lengthPercentageOrCalcType = {
   testInterpolation: function(property, setup) {
     lengthType.testInterpolation(property, setup);
@@ -1057,7 +1029,6 @@ const types = {
   discrete: discreteType,
   filterList: filterListType,
   integer: integerType,
-  positiveInteger: positiveIntegerType,
   length: lengthType,
   percentage: percentageType,
   lengthPercentageOrCalc: lengthPercentageOrCalcType,