Bug 1309119 part 4: Make the scrollframe, button, & fieldset anonymous inner boxes inherit -webkit-box container CSS properties. r=mats
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 20 Oct 2016 13:23:52 -0700
changeset 318898 06d4b91875087e77e8a6569b5df9db9b1ade7569
parent 318897 40f9955c5b70c06021107a998932ad0c9474b554
child 318899 a6f6e5cfe26cba29de94abc543fc158b95a4a18a
push id11
push usermaklebus@msu.edu
push dateMon, 31 Oct 2016 21:03:58 +0000
reviewersmats
bugs1309119
milestone52.0a1
Bug 1309119 part 4: Make the scrollframe, button, & fieldset anonymous inner boxes inherit -webkit-box container CSS properties. r=mats (We already do this for the properties that we use to configure modern flexbox.) MozReview-Commit-ID: KStEZ42FIqB
layout/reftests/webkit-box/reftest.list
layout/style/res/forms.css
layout/style/res/ua.css
--- a/layout/reftests/webkit-box/reftest.list
+++ b/layout/reftests/webkit-box/reftest.list
@@ -3,17 +3,17 @@
 default-preferences pref(layout.css.prefixes.webkit,true)
 
 # Tests for anonymous flex item formation inside of a "-webkit-box":
 # Note: some of these tests are marked as failing, because we don't match
 # WebKit/Blink on them.  (The reference case represents the WebKit/Blink
 # rendering.) We could probably make them pass by implementing some quirks, if
 # it turns out that the web depends on WebKit/Blink's behavior in these cases.
 == webkit-box-anon-flex-items-1a.html webkit-box-anon-flex-items-1-ref.html
-fails == webkit-box-anon-flex-items-1b.html webkit-box-anon-flex-items-1-ref.html # bug 1309119
+== webkit-box-anon-flex-items-1b.html webkit-box-anon-flex-items-1-ref.html
 fails == webkit-box-anon-flex-items-2.html webkit-box-anon-flex-items-2-ref.html
 fails == webkit-box-anon-flex-items-3.html webkit-box-anon-flex-items-3-ref.html
 
 # Tests for "-webkit-box" & "-webkit-inline-box" as display values:
 == webkit-display-values-1.html webkit-display-values-1-ref.html
 
 # Tests for "-webkit-box-align" (cross-axis alignment):
 == webkit-box-align-horiz-1a.html webkit-box-align-horiz-1-ref.html
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -24,16 +24,21 @@
   -moz-column-count: inherit;
   -moz-column-width: inherit;
   -moz-column-gap: inherit;
   -moz-column-rule: inherit;
   -moz-column-fill: inherit;
   /* Flex container */
   flex-direction: inherit;
   flex-wrap: inherit;
+  /* -webkit-box container (aliased from -webkit versions to -moz versions) */
+  -moz-box-orient: inherit;
+  -moz-box-direction: inherit;
+  -moz-box-pack: inherit;
+  -moz-box-align: inherit;
   /* Grid container */
   grid-auto-columns: inherit;
   grid-auto-rows: inherit;
   grid-auto-flow: inherit;
   grid-column-gap: inherit;
   grid-row-gap: inherit;
   grid-template-areas: inherit;
   grid-template-columns: inherit;
@@ -667,16 +672,21 @@ button {
   -moz-column-count: inherit;
   -moz-column-width: inherit;
   -moz-column-gap: inherit;
   -moz-column-rule: inherit;
   -moz-column-fill: inherit;
   /* Flex container */
   flex-direction: inherit;
   flex-wrap: inherit;
+  /* -webkit-box container (aliased from -webkit versions to -moz versions) */
+  -moz-box-orient: inherit;
+  -moz-box-direction: inherit;
+  -moz-box-pack: inherit;
+  -moz-box-align: inherit;
   /* Grid container */
   grid-auto-columns: inherit;
   grid-auto-rows: inherit;
   grid-auto-flow: inherit;
   grid-column-gap: inherit;
   grid-row-gap: inherit;
   grid-template-areas: inherit;
   grid-template-columns: inherit;
--- a/layout/style/res/ua.css
+++ b/layout/style/res/ua.css
@@ -160,32 +160,36 @@
 
 *|*::-moz-scrolled-content, *|*::-moz-scrolled-canvas,
 *|*::-moz-scrolled-page-sequence {
   /* e.g., text inputs, select boxes */
   padding: inherit;
   /* The display doesn't affect the kind of frame constructed here.  This just
      affects auto-width sizing of the block we create. */
   display: block;
-  -moz-box-orient: inherit;
   /* make unicode-bidi inherit, otherwise it has no effect on text inputs and
      blocks with overflow: scroll; */
   unicode-bidi: inherit;
   text-overflow: inherit;
   /* Please keep the Multicol/Flex/Grid/Align sections below in sync with
      ::-moz-fieldset-content/::-moz-button-content in forms.css */
   /* Multicol container */
   -moz-column-count: inherit;
   -moz-column-width: inherit;
   -moz-column-gap: inherit;
   -moz-column-rule: inherit;
   -moz-column-fill: inherit;
   /* Flex container */
   flex-direction: inherit;
   flex-wrap: inherit;
+  /* -webkit-box container (aliased from -webkit versions to -moz versions) */
+  -moz-box-orient: inherit;
+  -moz-box-direction: inherit;
+  -moz-box-pack: inherit;
+  -moz-box-align: inherit;
   /* Grid container */
   grid-auto-columns: inherit;
   grid-auto-rows: inherit;
   grid-auto-flow: inherit;
   grid-column-gap: inherit;
   grid-row-gap: inherit;
   grid-template-areas: inherit;
   grid-template-columns: inherit;