Import wpt@2f08203a98291809cf67839232d45e68752dcb25

Using wpt-import in Chromium 1c0aaae. With Chromium commits locally applied on WPT: 329c91e "Attempt to make test more stable" Note to sheriffs: This CL imports external tests and adds expectations for those tests; if this CL is large and causes a few new failures, please fix the failures by adding new lines to TestExpectations rather than reverting. See: https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md Directory owners for changes in this CL: jfernandez@igalia.com: external/wpt/css/css-align mstensho@chromium.org: external/wpt/css/css-multicol NOAUTOREVERT=true TBR=robertma No-Export: true Change-Id: I8c4c45659665aff442d6fa11993af23941e42d0b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1747270 Reviewed-by: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com> Commit-Queue: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#685886}
chromium · Aug 11, 2019 · 90b6a07 · 90b6a07
1 parent 47c6711
commit 90b6a07
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 38 deletions.
diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json
@@ -200449,6 +200449,24 @@
      {}
     ]
    ],
+   "css/css-align/parsing/column-gap-computed.html": [
+    [
+     "css/css-align/parsing/column-gap-computed.html",
+     {}
+    ]
+   ],
+   "css/css-align/parsing/column-gap-invalid.html": [
+    [
+     "css/css-align/parsing/column-gap-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-align/parsing/column-gap-valid.html": [
+    [
+     "css/css-align/parsing/column-gap-valid.html",
+     {}
+    ]
+   ],
    "css/css-align/parsing/justify-content-computed.html": [
     [
      "css/css-align/parsing/justify-content-computed.html",
@@ -206299,24 +206317,6 @@
      {}
     ]
    ],
-   "css/css-multicol/parsing/column-gap-computed.html": [
-    [
-     "css/css-multicol/parsing/column-gap-computed.html",
-     {}
-    ]
-   ],
-   "css/css-multicol/parsing/column-gap-invalid.html": [
-    [
-     "css/css-multicol/parsing/column-gap-invalid.html",
-     {}
-    ]
-   ],
-   "css/css-multicol/parsing/column-gap-valid.html": [
-    [
-     "css/css-multicol/parsing/column-gap-valid.html",
-     {}
-    ]
-   ],
    "css/css-multicol/parsing/column-rule-color-computed.html": [
     [
      "css/css-multicol/parsing/column-rule-color-computed.html",
@@ -344306,6 +344306,18 @@
    "25ea093b20997419f4d560d47cb9300d136d090e",
    "testharness"
   ],
+  "css/css-align/parsing/column-gap-computed.html": [
+   "01e04b04994ae61e1e94952f06757cc896ab75df",
+   "testharness"
+  ],
+  "css/css-align/parsing/column-gap-invalid.html": [
+   "181e004e7ca857444100513b0b82faeeddcc9648",
+   "testharness"
+  ],
+  "css/css-align/parsing/column-gap-valid.html": [
+   "4be3b50989f56de6d1209c196e6cb28cb2c2d151",
+   "testharness"
+  ],
   "css/css-align/parsing/justify-content-computed.html": [
    "b04d2db1429c385d57b9d6b232282d7924d6589b",
    "testharness"
@@ -369223,7 +369235,7 @@
    "testharness"
   ],
   "css/css-multicol/inheritance.html": [
-   "58e7a92669efad79a336b7342362290595bab874",
+   "e7938d3e9ffa2d21c57e4565283911431e56f17e",
    "testharness"
   ],
   "css/css-multicol/inline-block-and-column-span-all.html": [
@@ -370678,18 +370690,6 @@
    "ad5913d0bc0e77a8aa6e2937d5eebf47a348391a",
    "testharness"
   ],
-  "css/css-multicol/parsing/column-gap-computed.html": [
-   "d0f88d43b56efc85ed47e987f8429680ec321303",
-   "testharness"
-  ],
-  "css/css-multicol/parsing/column-gap-invalid.html": [
-   "8ec92df6c4be54f272c1bfffd8f71ad8372aca45",
-   "testharness"
-  ],
-  "css/css-multicol/parsing/column-gap-valid.html": [
-   "96ae68ee08813462c0eb9cb0d33d765fad376e0d",
-   "testharness"
-  ],
   "css/css-multicol/parsing/column-rule-color-computed.html": [
    "d5cc24075114d158871dba9f9236ee4103d1e4c7",
    "testharness"

diff --git a/...multicol/parsing/column-gap-computed.html → ...ss-align/parsing/column-gap-computed.html b/...multicol/parsing/column-gap-computed.html → ...ss-align/parsing/column-gap-computed.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Multi-column Layout: getComputedStyle().columnGap</title>
-<link rel="help" href="https://drafts.csswg.org/css-multicol/#propdef-column-gap">
+<title>CSS Box Alignment Level 3: getComputedStyle().columnGap</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-column-gap">
 <meta name="assert" content="column-gap computed value is as specified.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>

diff --git a/...-multicol/parsing/column-gap-invalid.html → ...css-align/parsing/column-gap-invalid.html b/...-multicol/parsing/column-gap-invalid.html → ...css-align/parsing/column-gap-invalid.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Multi-column Layout: parsing column-gap with invalid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-multicol/#propdef-column-gap">
+<title>CSS Box Alignment Level 3: parsing column-gap with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-column-gap">
 <meta name="assert" content="column-gap supports only the grammar '<length-percentage> | normal'.">
 <meta name="assert" content="column-gap rejects negative <length-percentage>.">
 <script src="/resources/testharness.js"></script>

diff --git a/...ss-multicol/parsing/column-gap-valid.html → ...s/css-align/parsing/column-gap-valid.html b/...ss-multicol/parsing/column-gap-valid.html → ...s/css-align/parsing/column-gap-valid.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Multi-column Layout: parsing column-gap with valid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-multicol/#propdef-column-gap">
+<title>CSS Box Alignment Level 3: parsing column-gap with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-column-gap">
 <meta name="assert" content="column-gap supports the full grammar '<length-percentage> | normal'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>

diff --git a/third_party/blink/web_tests/external/wpt/css/css-multicol/inheritance.html b/third_party/blink/web_tests/external/wpt/css/css-multicol/inheritance.html
@@ -34,7 +34,6 @@
 
 assert_not_inherited('column-count', 'auto', '2');
 assert_not_inherited('column-fill', 'balance', 'auto');
-assert_not_inherited('column-gap', 'normal', '10px');
 assert_not_inherited('column-rule-color', 'rgba(42, 53, 64, 0.75)', 'rgba(2, 3, 5, 0.5)');
 assert_not_inherited('column-rule-style', 'none', 'dashed');
 assert_not_inherited('column-rule-width', mediumWidth, '10px');