Bug 1454153 [wpt PR 10469] - CSS: Remove support for position values with 3 parts, a=testonly
authorEric Willigers <ericwilligers@chromium.org>
Sun, 22 Apr 2018 15:21:14 +0000
changeset 468888 61921a905038832ee4715729831d7fad92bb6ca0
parent 468887 b52bee578d05fd5dcdbdc4d5c2bcca03619088e5
child 468889 95d18c554b1bd335c2d1b535f448ab7251ad551a
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1454153, 10469, 804187, 1013459, 550915
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1454153 [wpt PR 10469] - CSS: Remove support for position values with 3 parts, a=testonly Automatic update from web-platform-testsCSS: Remove support for position values with 3 parts Intent: https://groups.google.com/a/chromium.org/d/msg/blink-dev/oBKMVCOX1sY/BLsXXiukAgAJ BUG=804187 Change-Id: I94e79b2b426250c521d0ebae1492571fde078f31 Reviewed-on: https://chromium-review.googlesource.com/1013459 Reviewed-by: Emil A Eklund <eae@chromium.org> Commit-Queue: Eric Willigers <ericwilligers@chromium.org> Cr-Commit-Position: refs/heads/master@{#550915} -- wpt-commits: ff4cf69b8f1d705039d71ceef94dee04e74b35c9 wpt-pr: 10469
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html
testing/web-platform/tests/css/css-shapes/parsing/shape-outside-invalid-position.html
testing/web-platform/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js
testing/web-platform/tests/css/css-transforms/parsing/perspective-origin-parsing-invalid.html
testing/web-platform/tests/css/css-typed-om/stylevalue-normalization/positionvalue-normalization.tentative.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -511996,17 +511996,17 @@
    "00de7ed5660dd4e1b37710aba7cf2664c4773749",
    "support"
   ],
   "css/css-shapes/OWNERS": [
    "d26aa70436055346420fd8bae6fd174daf090124",
    "support"
   ],
   "css/css-shapes/basic-shape-circle-ellipse-serialization.html": [
-   "b0841c5c1e328846aaa95376ae62178173cdf5a5",
+   "4794db47539ddd9fece83ccd6974e3d1018798a0",
    "testharness"
   ],
   "css/css-shapes/parsing/resources/parsing-testcommon.js": [
    "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
    "support"
   ],
   "css/css-shapes/parsing/shape-image-threshold-invalid.html": [
    "72fb606c460752043db729e7157483fd01f7ce0b",
@@ -512020,17 +512020,17 @@
    "678fe576221b82b6a85927de3337cef02f85da8d",
    "testharness"
   ],
   "css/css-shapes/parsing/shape-margin-valid.html": [
    "bf937f106b1d6e5b15abce0971da8773777a0ac0",
    "testharness"
   ],
   "css/css-shapes/parsing/shape-outside-invalid-position.html": [
-   "3f9db0d5ae274b76c5474a097560f97b7f32d80d",
+   "3b7e01bf56a8c3d8afaa600ba027502f716fddcc",
    "testharness"
   ],
   "css/css-shapes/parsing/shape-outside-invalid.html": [
    "024c4a2789493964b162397bc994b699274e1423",
    "testharness"
   ],
   "css/css-shapes/parsing/shape-outside-valid-position.html": [
    "be19a2491b17f77d9dfda2fe03f6f099d7fe7d9b",
@@ -512936,17 +512936,17 @@
    "8dd611c1f104f69807f631849d38da168874a9a2",
    "testharness"
   ],
   "css/css-shapes/shape-outside/values/shape-outside-shape-notation-000.html": [
    "edf23e6fdcd2d7699ce484089664da5d03e3a1e2",
    "testharness"
   ],
   "css/css-shapes/shape-outside/values/support/parsing-utils.js": [
-   "9ef646aa7352e94c2b2e43b0031d3fb654ac2985",
+   "159b330eb6571af860bcf5da8bc0ad281272f776",
    "support"
   ],
   "css/css-shapes/spec-examples/reference/shape-outside-001-ref.html": [
    "d8c95d8e9be7dbfbbe17b40d841636beb18c669c",
    "support"
   ],
   "css/css-shapes/spec-examples/reference/shape-outside-004-ref.html": [
    "997a41f86ea9e2720ae1971d8303221a8b3475fb",
@@ -521368,17 +521368,17 @@
    "ba9c2a4e7666c9dbc63ea9300a9b5093f87dbdd5",
    "reftest"
   ],
   "css/css-transforms/matrix/svg-matrix-069.html": [
    "b7f8e44c24d152196d929ace4549ac5e56e7c23f",
    "reftest"
   ],
   "css/css-transforms/parsing/perspective-origin-parsing-invalid.html": [
-   "f12960646ce37cbce073602129d93d72bcc68cbf",
+   "90c8004a65f712acfeb60368bdda84fc85952567",
    "testharness"
   ],
   "css/css-transforms/parsing/perspective-origin-parsing-valid.html": [
    "4849602a7ede7e6a9390092525dfcaec42ef9c7f",
    "testharness"
   ],
   "css/css-transforms/parsing/resources/parsing-testcommon.js": [
    "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
@@ -526268,17 +526268,17 @@
    "610c574943d249eef4840dccc8553d691c190748",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-normalization/normalize-tokens.tentative.html": [
    "b97cb5cd21208190a9203d4a6d30b7994c2946b1",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-normalization/positionvalue-normalization.tentative.html": [
-   "9334ee684f4a2897f6a191d9217e63af5630cc0d",
+   "dece9feb0c66e2830d47e712891feaa11c80809e",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-normalization/transformvalue-normalization.tentative.html": [
    "f5078badde83ca4823844a9df5cde800593efbfc",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-objects/parse-invalid.html": [
    "5c699b58f44dfc6d352cfae423eca4981eb78f1e",
--- a/testing/web-platform/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html
+++ b/testing/web-platform/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html
@@ -30,18 +30,18 @@ checkEquals("circle(0px)", "circle(0px a
 checkEquals("circle(closest-side)", "circle(at 50% 50%)");
 checkEquals("circle(farthest-side)",
             "circle(farthest-side at 50% 50%)");
 checkEquals("ellipse()", "ellipse(at 50% 50%)");
 checkEquals("ellipse(closest-side farthest-side)",
             "ellipse(closest-side farthest-side at 50% 50%)");
 
 
-checkEquals("circle(at right 5px top)", "circle(at right 5px top 0%)");
-checkEquals("ellipse(at right 10px top)", "ellipse(at right 10px top 0%)");
+checkEquals("circle(at top 0% right 5px)", "circle(at right 5px top 0%)");
+checkEquals("ellipse(at top 0% right 10px)", "ellipse(at right 10px top 0%)");
 // Remove defaults like closest-side
 checkEquals("circle(closest-side at center)",
             "circle(at 50% 50%)");
 checkEquals("ellipse(closest-side closest-side at center)",
             "ellipse(at 50% 50%)");
 
 // don't remove non defaults
 checkEquals("circle(farthest-side at center)",
--- a/testing/web-platform/tests/css/css-shapes/parsing/shape-outside-invalid-position.html
+++ b/testing/web-platform/tests/css/css-shapes/parsing/shape-outside-invalid-position.html
@@ -9,20 +9,21 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/parsing-testcommon.js"></script>
 </head>
 <body>
 <script>
 // The following were supported in an earlier version of the spec.
 // https://github.com/w3c/csswg-drafts/issues/2140
-// Deprecated in Blink with support to be removed in M68, around July 2018.
 test_invalid_value("shape-outside", "circle(at center left 1px)");
 test_invalid_value("shape-outside", "circle(at center top 2px)");
 test_invalid_value("shape-outside", "circle(at right 3% center)");
 test_invalid_value("shape-outside", "circle(at left 4px top)");
-test_invalid_value("shape-outside", "circle(at right top 5px)");
-test_invalid_value("shape-outside", "circle(at bottom 6% center)");
-test_invalid_value("shape-outside", "circle(at bottom 7% left)");
-test_invalid_value("shape-outside", "circle(at bottom right 8%)");
+test_invalid_value("shape-outside", "circle(at right 5px top)");
+test_invalid_value("shape-outside", "ellipse(at right top 5px)");
+test_invalid_value("shape-outside", "ellipse(at bottom 6% center)");
+test_invalid_value("shape-outside", "ellipse(at bottom 7% left)");
+test_invalid_value("shape-outside", "ellipse(at bottom right 8%)");
+test_invalid_value("shape-outside", "ellipse(at right 10px top)");
 </script>
 </body>
 </html>
--- a/testing/web-platform/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js
+++ b/testing/web-platform/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js
@@ -529,75 +529,16 @@ var validPositions = [
     ["70% bottom", "70% 100%"],
     ["70u1 bottom", "70u1 100%"],
 
     ["center 60%", "50% 60%"],
     ["center 60u1", "50% 60u1"],
     ["60% center", "60% 50%"],
     ["60u1 center", "60u1 50%"],
 
-////// [ keyword | keyword percent ], [ keyword | keyword length ] x 5 keywords
-    ["center top 50%", "50% 50%"],
-    ["center top 50u1", "50% 50u1"],
-    ["center left 50%", "50% 50%"],
-    ["center left 50u1", "50u1 50%"],
-    ["center right 70%", "30% 50%"],
-    ["center right 70u1", "right 70u1 top 50%"],
-    ["center bottom 70%", "50% 30%"],
-    ["center bottom 70u1", "left 50% bottom 70u1"],
-
-    ["left top 50%", "0% 50%"],
-    ["left top 50u1", "0% 50u1"],
-    ["left bottom 70%", "0% 30%"],
-    ["left bottom 70u1", "left 0% bottom 70u1"],
-
-    ["top left 50%", "50% 0%"],
-    ["top left 50u1", "50u1 0%"],
-    ["top right 70%", "30% 0%"],
-    ["top right 70u1", "right 70u1 top 0%"],
-
-    ["bottom left 50%", "50% 100%"],
-    ["bottom left 50u1", "50u1 100%"],
-    ["bottom right 70%", "30% 100%"],
-    ["bottom right 70u1", "right 70u1 top 100%"],
-
-    ["right bottom 70%", "100% 30%"],
-    ["right bottom 70u1", "left 100% bottom 70u1"],
-    ["right top 50%", "100% 50%"],
-    ["right top 50u1", "100% 50u1"],
-
-////// [ keyword percent | keyword], [ keyword length | keyword ] x 5 keywords
-    ["left 50% center", "50% 50%"],
-    ["left 50u1 center", "50u1 50%"],
-    ["left 50% top", "50% 0%"],
-    ["left 50u1 top", "50u1 0%"],
-    ["left 50% bottom", "50% 100%"],
-    ["left 50u1 bottom", "50u1 100%"],
-
-    ["top 50% center", "50% 50%"],
-    ["top 50u1 center", "50% 50u1"],
-    ["top 50% left", "0% 50%"],
-    ["top 50u1 left", "0% 50u1"],
-    ["top 50% right", "100% 50%"],
-    ["top 50u1 right", "100% 50u1"],
-
-    ["bottom 70% center", "50% 30%"],
-    ["bottom 70u1 center", "left 50% bottom 70u1"],
-    ["bottom 70% left", "0% 30%"],
-    ["bottom 70u1 left", "left 0% bottom 70u1"],
-    ["bottom 70% right", "100% 30%"],
-    ["bottom 70u1 right", "left 100% bottom 70u1"],
-
-    ["right 80% center", "20% 50%"],
-    ["right 80u1 center", "right 80u1 top 50%"],
-    ["right 80% bottom", "20% 100%"],
-    ["right 80u1 bottom", "right 80u1 top 100%"],
-    ["right 80% top", "20% 0%"],
-    ["right 80u1 top", "right 80u1 top 0%"],
-
 ////// [ keyword percent |  keyword percent], [ keyword percent |  keyword length],
 ////// [ keyword length | keyword length],  [ keyword length | keyword percent] x 5 keywords
     ["left 50% top 50%", "50% 50%"],
     ["left 50% top 50u1", "50% 50u1"],
     ["left 50% bottom 70%", "50% 30%"],
     ["left 50% bottom 70u1", "left 50% bottom 70u1"],
     ["left 50u1 top 50%", "50u1 50%"],
     ["left 50u1 top 50u1", "50u1 50u1"],
--- a/testing/web-platform/tests/css/css-transforms/parsing/perspective-origin-parsing-invalid.html
+++ b/testing/web-platform/tests/css/css-transforms/parsing/perspective-origin-parsing-invalid.html
@@ -14,17 +14,16 @@
 <script>
 test_invalid_value("perspective-origin", "auto");
 test_invalid_value("perspective-origin", "1px 2px 3px");
 test_invalid_value("perspective-origin", "left right");
 test_invalid_value("perspective-origin", "bottom 10% top 20%");
 
 // The following were supported in an earlier version of the spec.
 // https://github.com/w3c/csswg-drafts/issues/2140
-// Deprecated in Blink with support to be removed in M68, around July 2018.
 test_invalid_value("perspective-origin", "center left 1px");
 test_invalid_value("perspective-origin", "center top 2px");
 test_invalid_value("perspective-origin", "right 3% center");
 test_invalid_value("perspective-origin", "left 4px top");
 test_invalid_value("perspective-origin", "right top 5px");
 test_invalid_value("perspective-origin", "bottom 6% center");
 test_invalid_value("perspective-origin", "bottom 7% left");
 test_invalid_value("perspective-origin", "bottom right 8%");
--- a/testing/web-platform/tests/css/css-typed-om/stylevalue-normalization/positionvalue-normalization.tentative.html
+++ b/testing/web-platform/tests/css/css-typed-om/stylevalue-normalization/positionvalue-normalization.tentative.html
@@ -47,19 +47,18 @@ for (const {cssText, x, y} of gSingleTes
       assert_style_value_equals(styleMap.get('object-position'), new CSSPositionValue(x, y));
     }, 'CSS <position> value "' + cssText + '" normalizes to CSSPositionValue');
 }
 
 for (const {cssText: xCssText, x, type: xType} of gXTestCases) {
   for (const {cssText: yCssText, y, type: yType} of gYTestCases) {
     const cssText = xCssText + ' ' + yCssText;
 
-    // Can't have things like left 10px 20px
-    if ((xType == 'offset' && yType == 'length') ||
-        (xType == 'length' && yType == 'offset'))
+    // Can't have position values with 3 parts
+    if ((xType === 'offset') !== (yType === 'offset'))
       continue;
 
     test(t => {
       const styleMap = createInlineStyleMap(t, 'object-position: ' + cssText);
       assert_style_value_equals(styleMap.get('object-position'), new CSSPositionValue(x, y));
     }, 'CSS <position> value "' + cssText + '" normalizes to CSSPositionValue');
   }
 }