From c91912c715d30d9f9e51f7cbc784ce523247b916 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Thu, 3 Oct 2019 00:27:58 +0000
Subject: [PATCH] Bug 1454205 [wpt PR 10477] - Accept two values in the
 overflow shorthand, a=testonly

Automatic update from web-platform-testsAccept two values in the overflow shorthand

https://github.com/w3c/csswg-drafts/issues/2484 details the resolution
by the CSSWG to accept two values in the overflow shorthand. Update our
implementation to match this, and also update two existing CSSOM
serialization tests. Additionally remove tests that are duplicates of
those currently found in WPT.

Intent to Implement and Ship:
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/4qF8XPQ1z2s

Bug: 833105
Change-Id: Id8f61182a7d7369a2f575acfdbf608600d1218dd
Reviewed-on: https://chromium-review.googlesource.com/1013618
Commit-Queue: Chris Nardi <cnardichromium.org>
Reviewed-by: Rune Lillesveen <futharkchromium.org>
Cr-Commit-Position: refs/heads/master{#554078}

--

wpt-commits: e6756de059f68d445306ac35a6b8e80633d75925
wpt-pr: 10477

UltraBlame original commit: 22226423b006da14b61e173f36b6e228880d04db
---
 testing/web-platform/meta/MANIFEST.json       |  4 +--
 .../css/cssom/overflow-serialization.html     | 36 +++++++------------
 .../tests/css/cssom/shorthand-values.html     |  7 ----
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index fb73d0febe5e8..1c510cb6c89b7 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -3573924,7 +3573924,7 @@ html
 :
 [
 "
-48ca70f4c20da103276e1b053ca0e4613fcc2819
+85952fbd040de03f5082f28ba8116fd4827a1fc3
 "
 "
 testharness
@@ -3574168,7 +3574168,7 @@ html
 :
 [
 "
-8bfc0dff5da1859e17df31ceeca710d17a982109
+9211674fd69ddfa32d3bafcf2bc967977eb3ec31
 "
 "
 testharness
diff --git a/testing/web-platform/tests/css/cssom/overflow-serialization.html b/testing/web-platform/tests/css/cssom/overflow-serialization.html
index 0defe6e0e48a6..bdf9fc1d5f1a5 100644
--- a/testing/web-platform/tests/css/cssom/overflow-serialization.html
+++ b/testing/web-platform/tests/css/cssom/overflow-serialization.html
@@ -24,15 +24,9 @@
 >
 CSSOM
 -
-Overlow
-property
-has
-different
+Overflow
+shorthand
 serialization
-than
-other
-shorthands
-.
 <
 /
 title
@@ -156,13 +150,13 @@
 -
 x
 :
-inherit
+scroll
 ;
 overflow
 -
 y
 :
-unset
+hidden
 ;
 }
 <
@@ -350,16 +344,9 @@
 cssText
 "
 overflow
--
-x
-:
-inherit
-;
-overflow
--
-y
 :
-unset
+scroll
+hidden
 ;
 "
 "
@@ -583,7 +570,7 @@
 overflowX
 =
 "
-inherit
+scroll
 "
 ;
 div
@@ -593,7 +580,7 @@
 overflowY
 =
 "
-unset
+hidden
 "
 ;
 assert_equals
@@ -604,6 +591,8 @@
 .
 overflow
 "
+scroll
+hidden
 "
 "
 Overflow
@@ -615,10 +604,9 @@
 with
 different
 keywords
-shouldn
-'
-t
+should
 serialize
+correctly
 .
 "
 )
diff --git a/testing/web-platform/tests/css/cssom/shorthand-values.html b/testing/web-platform/tests/css/cssom/shorthand-values.html
index c7c9feea67283..b567c265a2a93 100644
--- a/testing/web-platform/tests/css/cssom/shorthand-values.html
+++ b/testing/web-platform/tests/css/cssom/shorthand-values.html
@@ -525,15 +525,8 @@
 :
 '
 overflow
--
-x
 :
 scroll
-;
-overflow
--
-y
-:
 hidden
 ;
 '