Merge mozilla-inbound to mozilla-central a=merge FIREFOX_BETA_66_BASE
authorRazvan Maries <rmaries@mozilla.com>
Mon, 21 Jan 2019 13:34:31 +0200
changeset 454638 254bd88c107271f3d1c2ca9969acc0ed507f0a8d
parent 454632 f1694d9e640bd1768178e121a5d6fb73565bd32c (current diff)
parent 454637 c486d86fd49fc2079255f8c96d94ec8c1fa2950a (diff)
child 454639 e43944736829dc575bb12821f0e28bf1bc02c285
child 454655 af184e29a54633ac5b8dc0a7726dd556676c243e
child 454676 8c452bdd54f5d7b91322422c7955066ae7019f32
push id35407
push userrmaries@mozilla.com
push dateMon, 21 Jan 2019 11:35:14 +0000
treeherdermozilla-central@254bd88c1072 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone66.0a1
first release with
nightly linux32
254bd88c1072 / 66.0a1 / 20190121113514 / files
nightly linux64
254bd88c1072 / 66.0a1 / 20190121113514 / files
nightly mac
254bd88c1072 / 66.0a1 / 20190121113514 / files
nightly win32
254bd88c1072 / 66.0a1 / 20190121113514 / files
nightly win64
254bd88c1072 / 66.0a1 / 20190121113514 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-inbound to mozilla-central a=merge
layout/style/test/property_database.js
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -6692,16 +6692,32 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
       "max-content",
       "min-content",
       "unset"
     ]
   },
+  "inset": {
+    "isInherited": false,
+    "subproperties": [
+      "top",
+      "right",
+      "bottom",
+      "left"
+    ],
+    "supports": [],
+    "values": [
+      "auto",
+      "inherit",
+      "initial",
+      "unset"
+    ]
+  },
   "inset-block": {
     "isInherited": false,
     "subproperties": [
       "inset-block-start",
       "inset-block-end"
     ],
     "supports": [],
     "values": [
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -6564,16 +6564,28 @@ var gCSSProperties = {
       "calc(2px)",
       "calc(50%)",
       "calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
     ],
     invalid_values: [ "none", "5" ]
   },
+  "inset": {
+    domProp: "inset",
+    inherited: false,
+    type: CSS_TYPE_TRUE_SHORTHAND,
+    subproperties: [ "top", "right", "bottom", "left" ],
+    /* FIXME: run tests with multiple prerequisites */
+    prerequisites: { "position": "relative" },
+    initial_values: [ "auto" ],
+    other_values: [ "3px 0", "2em 4px 2pt", "1em 2em 3px 4px", "1em calc(2em + 3px) 4ex 5cm" ],
+    invalid_values: [ "1px calc(nonsense)", "1px red", "3" ],
+    unbalanced_values: [ "1px calc(" ],
+  },
   "inset-block": {
     domProp: "insetBlock",
     inherited: false,
     type: CSS_TYPE_TRUE_SHORTHAND,
     subproperties: [ "inset-block-start", "inset-block-end" ],
     /* FIXME: run tests with multiple prerequisites */
     prerequisites: { "position": "relative" },
     initial_values: [ "auto", "auto auto" ],
--- a/servo/components/style/properties/shorthands/position.mako.rs
+++ b/servo/components/style/properties/shorthands/position.mako.rs
@@ -758,16 +758,25 @@
                 self.justify_items.to_css(dest)?;
             }
 
             Ok(())
         }
     }
 </%helpers:shorthand>
 
+// See https://github.com/w3c/csswg-drafts/issues/3525 for the quirks stuff.
+${helpers.four_sides_shorthand(
+    "inset",
+    "%s",
+    "specified::LengthPercentageOrAuto::parse",
+    spec="https://drafts.csswg.org/css-logical/#propdef-inset",
+    allow_quirks=False,
+)}
+
 % for axis in ["block", "inline"]:
     <%
         spec = "https://drafts.csswg.org/css-logical/#propdef-inset-%s" % axis
     %>
     <%helpers:shorthand
         name="inset-${axis}"
         sub_properties="${' '.join(
             'inset-%s-%s' % (axis, side)
--- a/testing/web-platform/meta/css/css-logical/logical-box-inset.html.ini
+++ b/testing/web-platform/meta/css/css-logical/logical-box-inset.html.ini
@@ -1,40 +1,12 @@
 [logical-box-inset.html]
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: horizontal-tb; direction: ltr; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: horizontal-tb; direction: rtl; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: vertical-rl; direction: rtl; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: sideways-rl; direction: rtl; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: vertical-rl; direction: ltr; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: sideways-rl; direction: ltr; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: vertical-lr; direction: rtl; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: sideways-lr; direction: ltr; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: vertical-lr; direction: ltr; '.]
-    expected: FAIL
-
-  [Test that inset-* shorthands set the computed value of both logical and physical longhands, with 'writing-mode: sideways-lr; direction: rtl; '.]
-    expected: FAIL
-
   [Test that inset shorthand sets longhands and serializes correctly.]
     expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=137688
 
   [Test that inset-inline shorthand sets longhands and serializes correctly.]
     expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=137688
 
   [Test that inset-block shorthand sets longhands and serializes correctly.]
     expected: FAIL
-
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=137688